X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fhttp-functions.php;h=8bc96cd0b012e72d05178c8f5b302029186188ac;hb=45799353e6886efecaa6fe169848321a81a08c6e;hp=6901f38febd998226efc649d46cf1e72674968e1;hpb=ca256746fe0757a23df4064824c8fe2087ad5634;p=mailer.git

diff --git a/inc/http-functions.php b/inc/http-functions.php
index 6901f38feb..8bc96cd0b0 100644
--- a/inc/http-functions.php
+++ b/inc/http-functions.php
@@ -321,7 +321,7 @@ function sendRawRequest ($host, $request, $allowOnlyHttpOkay = TRUE) {
 	$port = 80;
 
 	// Initialize array
-	$response = array('', '', '');
+	$response = array();
 
 	// Default is non-broken HTTP server implementation
 	$GLOBALS['is_http_server_broken'] = FALSE;
@@ -409,8 +409,11 @@ function sendRawRequest ($host, $request, $allowOnlyHttpOkay = TRUE) {
 		// Get line from stream
 		$line = fgets($resource, 128);
 
-		// Ignore empty lines because of non-blocking mode
-		if (empty($line)) {
+		/*
+		 * Ignore empty lines because of non-blocking mode, you cannot use
+		 * empty() here as it would also see \r\n as "empty".
+		 */
+		if (strlen($line) == 0) {
 			// uslepp a little to avoid 100% CPU load
 			usleep(10);
 
@@ -425,7 +428,7 @@ function sendRawRequest ($host, $request, $allowOnlyHttpOkay = TRUE) {
 		} // END - if
 
 		// Add it to response
-		//* DEBUG: */ print 'line='.$line.'<br />';
+		//* DEBUG: */ print 'line(' . strlen($line) . ')='.$line.'<br />';
 		array_push($response, $line);
 	} // END - while
 
@@ -438,22 +441,6 @@ function sendRawRequest ($host, $request, $allowOnlyHttpOkay = TRUE) {
 		logDebugMessage(__FUNCTION__, __LINE__, 'Request took ' . (microtime(TRUE) - $start) . ' seconds and returned ' . count($response) . ' line(s).');
 	} // END - if
 
-	// Skip first empty lines
-	$resp = $response;
-	foreach ($resp as $idx => $line) {
-		// Trim space away
-		$line = trim($line);
-
-		// Is this line empty?
-		if (empty($line)) {
-			// Then remove it
-			array_shift($response);
-		} else {
-			// Abort on first non-empty line
-			break;
-		}
-	} // END - foreach
-
 	//* DEBUG: */ debugOutput('<strong>Request:</strong><pre>'.print_r($request, TRUE).'</pre>');
 	//* DEBUG: */ debugOutput('<strong>Response:</strong><pre>'.print_r($response, TRUE).'</pre>');
 
@@ -589,6 +576,9 @@ function unchunkHttpResponse ($response) {
 
 // Merges HTTP header lines with given body (string)
 function mergeHttpHeadersWithBody ($body) {
+	// Add empty entry to mimic header->body
+	$GLOBALS['http_headers'][] = getConfig('HTTP_EOL');
+
 	// Make sure at least one header is there (which is still not valid but okay here)
 	assert((is_array($GLOBALS['http_headers'])) && (count($GLOBALS['http_headers']) > 0));
 
@@ -618,8 +608,14 @@ function removeHttpHeaderFromResponse ($response) {
 				break;
 			} // END - if
 
-			// Add full line to temporary global array
-			array_push($GLOBALS['http_headers'], $line);
+			// Is the last line set and is not ending with \r\n?
+			if ((isset($GLOBALS['http_headers'][count($GLOBALS['http_headers']) - 1])) && (substr($GLOBALS['http_headers'][count($GLOBALS['http_headers']) - 1], -2, 2) != getConfig('HTTP_EOL'))) {
+				// Add it to previous one
+				$GLOBALS['http_headers'][count($GLOBALS['http_headers']) - 1] .= $line;
+			} else {
+				// Add full line to temporary global array
+				array_push($GLOBALS['http_headers'], $line);
+			}
 		} // END - foreach
 
 		// Write back the array