$port = 80;
// Initialize array
- $response = array('', '', '');
+ $response = array();
// Default is non-broken HTTP server implementation
$GLOBALS['is_http_server_broken'] = FALSE;
// 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);
} // END - if
// Add it to response
- //* DEBUG: */ print 'line='.$line.'<br />';
+ //* DEBUG: */ print 'line(' . strlen($line) . ')='.$line.'<br />';
array_push($response, $line);
} // END - while
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>');
// 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));
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