X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fhttp-functions.php;h=4fc66c95a5a94a4850f1af9106d3a284b9e34ace;hp=9398678b10d3ec170bf7e798b1508ddf25a3e39e;hb=6d08952d672c5a5de7d8522f894a5665599a2a4a;hpb=3971209b0996a1b0506d6ddaf7326432933eae1b

diff --git a/inc/http-functions.php b/inc/http-functions.php
index 9398678b10..4fc66c95a5 100644
--- a/inc/http-functions.php
+++ b/inc/http-functions.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -40,6 +40,12 @@ if (!defined('__SECURITY')) {
 	die();
 } // END - if
 
+// Initialize HTTP handling
+function initHttp () {
+	// Initialize array
+	$GLOBALS['http_header'] = array();
+}
+
 // Sends out all headers required for HTTP/1.1 reply
 function sendHttpHeaders () {
 	// Used later
@@ -54,13 +60,20 @@ function sendHttpHeaders () {
 	addHttpHeader('Cache-Control: no-store, no-cache, must-revalidate, pre-check=0, post-check=0, max-age=0'); // HTTP/1.1
 	addHttpHeader('Pragma: no-cache'); // HTTP/1.0
 	addHttpHeader('Connection: Close');
-	addHttpHeader('Content-Type: ' . getContentType() . '; charset=UTF-8');
+
+	// There shall be no output mode in raw output-mode
+	if (!isRawOutputMode()) {
+		// Send content-type not in raw output-mode
+		addHttpHeader('Content-Type: ' . getContentType() . '; charset=UTF-8');
+	} // END - if
+
+	// Add language
 	addHttpHeader('Content-Language: ' . getLanguage());
 }
 
-// Checks wether the URL is full-qualified (http[s]:// + hostname [+ request data])
+// Checks whether the URL is full-qualified (http[s]:// + hostname [+ request data])
 function isFullQualifiedUrl ($url) {
-	// Do we have cache?
+	// Is there cache?
 	if (!isset($GLOBALS[__FUNCTION__][$url])) {
 		// Determine it
 		$GLOBALS[__FUNCTION__][$url] = ((substr($url, 0, 7) == 'http://') || (substr($url, 0, 8) == 'https://'));
@@ -92,7 +105,7 @@ function generateGetUrlFromBaseUrlData ($baseUrl, $requestData = array()) {
 
 	// There should be data, else we don't need to extend $baseUrl with $body
 	if (!empty($body)) {
-		// Do we have a question-mark in the script?
+		// Is there a question-mark in the script?
 		if (!isInString('?', $baseUrl)) {
 			// No, so first char must be question mark
 			$body = '?' . $body;
@@ -131,26 +144,26 @@ function removeHttpHostNameFromUrl ($url) {
 }
 
 // Sends a HTTP request (GET, POST, HEAD are currently supported)
-function sendHttpRequest ($requestType, $baseUrl, $requestData = array(), $removeHeader = false) {
+function sendHttpRequest ($requestType, $baseUrl, $requestData = array(), $removeHeader = FALSE, $allowOnlyHttpOkay = TRUE) {
 	// Init response
 	$response = array();
 
 	// Start "detecting" the request type
 	switch ($requestType) {
 		case 'HEAD': // Send a HTTP/1.1 HEAD request
-			$response = sendHeadRequest($baseUrl, $requestData);
+			$response = sendHttpHeadRequest($baseUrl, $requestData, $allowOnlyHttpOkay);
 			break;
 
 		case 'GET': // Send a HTTP/1.1 GET request
-			$response = sendGetRequest($baseUrl, $requestData, $removeHeader);
+			$response = sendHttpGetRequest($baseUrl, $requestData, $removeHeader, $allowOnlyHttpOkay);
 			break;
 
 		case 'POST': // Send a HTTP/1.1 POST request
-			$response = sendPostRequest($baseUrl, $requestData, $removeHeader);
+			$response = sendHttpPostRequest($baseUrl, $requestData, $removeHeader, $allowOnlyHttpOkay);
 			break;
 
 		default: // Unsupported HTTP request, this is really bad and needs fixing
-			debug_report_bug(__FUNCTION__, __LINE__, 'Unsupported request detected. requestType=' . $requestType . ',baseUrl=' . $baseUrl . ',requestData()=' . count($requestData));
+			reportBug(__FUNCTION__, __LINE__, 'Unsupported request detected. requestType=' . $requestType . ',baseUrl=' . $baseUrl . ',requestData()=' . count($requestData));
 			break;
 	} // END - switch
 
@@ -159,11 +172,12 @@ function sendHttpRequest ($requestType, $baseUrl, $requestData = array(), $remov
 }
 
 // Sends a HEAD request
-function sendHeadRequest ($baseUrl, $requestData = array()) {
+function sendHttpHeadRequest ($baseUrl, $requestData = array(), $allowOnlyHttpOkay = TRUE) {
 	// Generate full GET URL
 	$getUrl = generateGetUrlFromBaseUrlData($baseUrl, $requestData);
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'getUrl=' . $getUrl);
 
-	// Do we have http[s]:// in front of the URL?
+	// Is there http[s]:// in front of the URL?
 	if (isFullQualifiedUrl($getUrl)) {
 		// Remove http[s]://<hostname> from URL
 		$getUrl = removeHttpHostNameFromUrl($getUrl);
@@ -176,7 +190,7 @@ function sendHeadRequest ($baseUrl, $requestData = array()) {
 	$host = extractHostnameFromUrl($baseUrl);
 
 	// Generate HEAD request header
-	$request  = 'HEAD ' . trim($getUrl) . ' HTTP/1.1' . getConfig('HTTP_EOL');
+	$request  = 'HEAD ' . (isProxyUsed() === TRUE ? $baseUrl : '') . trim($getUrl) . ' HTTP/1.1' . getConfig('HTTP_EOL');
 	$request .= 'Host: ' . $host . getConfig('HTTP_EOL');
 	$request .= 'Referer: ' . getUrl() . '/admin.php' . getConfig('HTTP_EOL');
 	if (isConfigEntrySet('FULL_VERSION')) {
@@ -191,18 +205,19 @@ function sendHeadRequest ($baseUrl, $requestData = array()) {
 	$request .= getConfig('HTTP_EOL');
 
 	// Send the raw request
-	$response = sendRawRequest($host, $request);
+	$response = sendRawRequest($host, $request, $allowOnlyHttpOkay);
 
 	// Return the result to the caller function
 	return $response;
 }
 
 // Send a GET request
-function sendGetRequest ($baseUrl, $requestData = array(), $removeHeader = false) {
+function sendHttpGetRequest ($baseUrl, $requestData = array(), $removeHeader = FALSE, $allowOnlyHttpOkay = TRUE) {
 	// Generate full GET URL
 	$getUrl = generateGetUrlFromBaseUrlData($baseUrl, $requestData);
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'getUrl=' . $getUrl);
 
-	// Do we have http[s]:// in front of the URL?
+	// Is there http[s]:// in front of the URL?
 	if (isFullQualifiedUrl($getUrl)) {
 		// Remove http[s]://<hostname> from url
 		$getUrl = removeHttpHostNameFromUrl($getUrl);
@@ -215,7 +230,7 @@ function sendGetRequest ($baseUrl, $requestData = array(), $removeHeader = false
 	$host = extractHostnameFromUrl($baseUrl);
 
 	// Generate GET request header
-	$request  = 'GET ' . trim($getUrl) . ' HTTP/1.1' . getConfig('HTTP_EOL');
+	$request  = 'GET ' . (isProxyUsed() === TRUE ? $baseUrl : '') . trim($getUrl) . ' HTTP/1.1' . getConfig('HTTP_EOL');
 	$request .= 'Host: ' . $host . getConfig('HTTP_EOL');
 	$request .= 'Referer: ' . getUrl() . '/admin.php' . getConfig('HTTP_EOL');
 	if (isConfigEntrySet('FULL_VERSION')) {
@@ -230,10 +245,10 @@ function sendGetRequest ($baseUrl, $requestData = array(), $removeHeader = false
 	$request .= getConfig('HTTP_EOL');
 
 	// Send the raw request
-	$response = sendRawRequest($host, $request);
+	$response = sendRawRequest($host, $request, $allowOnlyHttpOkay);
 
 	// Should we remove header lines?
-	if ($removeHeader === true) {
+	if ($removeHeader === TRUE) {
 		// Okay, remove them
 		$response = removeHttpHeaderFromResponse($response);
 	} // END - if
@@ -242,12 +257,12 @@ function sendGetRequest ($baseUrl, $requestData = array(), $removeHeader = false
 	return $response;
 }
 
-// Send a POST request
-function sendPostRequest ($baseUrl, $requestData, $removeHeader = false) {
+// Send a POST request, sometimes even POST requests have no parameters
+function sendHttpPostRequest ($baseUrl, $requestData = array(), $removeHeader = FALSE, $allowOnlyHttpOkay = TRUE) {
 	// Copy baseUrl to getUrl
 	$getUrl = $baseUrl;
 
-	// Do we have http[s]:// in front of the URL?
+	// Is there http[s]:// in front of the URL?
 	if (isFullQualifiedUrl($getUrl)) {
 		// Remove http[s]://<hostname> from url
 		$getUrl = removeHttpHostNameFromUrl($getUrl);
@@ -263,7 +278,7 @@ function sendPostRequest ($baseUrl, $requestData, $removeHeader = false) {
 	$body = http_build_query($requestData, '', '&');
 
 	// Generate POST request header
-	$request  = 'POST ' . trim($baseUrl) . ' HTTP/1.0' . getConfig('HTTP_EOL');
+	$request  = 'POST ' . (isProxyUsed() === TRUE ? $baseUrl : '') . trim($baseUrl) . ' HTTP/1.0' . getConfig('HTTP_EOL');
 	$request .= 'Host: ' . $host . getConfig('HTTP_EOL');
 	$request .= 'Referer: ' . getUrl() . '/admin.php' . getConfig('HTTP_EOL');
 	if (isConfigEntrySet('FULL_VERSION')) {
@@ -283,10 +298,10 @@ function sendPostRequest ($baseUrl, $requestData, $removeHeader = false) {
 	$request .= $body;
 
 	// Send the raw request
-	$response = sendRawRequest($host, $request);
+	$response = sendRawRequest($host, $request, $allowOnlyHttpOkay);
 
 	// Should we remove header lines?
-	if ($removeHeader === true) {
+	if ($removeHeader === TRUE) {
 		// Okay, remove them
 		$response = removeHttpHeaderFromResponse($response);
 	} // END - if
@@ -296,7 +311,7 @@ function sendPostRequest ($baseUrl, $requestData, $removeHeader = false) {
 }
 
 // Sends a raw request (string) to given host (hostnames will be solved)
-function sendRawRequest ($host, $request) {
+function sendRawRequest ($host, $request, $allowOnlyHttpOkay = TRUE) {
 	//* DEBUG: */ die('host='.$host.',request=<pre>'.$request.'</pre>');
 	// Init errno and errdesc with 'all fine' values
 	$errno = '0';
@@ -306,10 +321,10 @@ function sendRawRequest ($host, $request) {
 	$port = 80;
 
 	// Initialize array
-	$response = array('', '', '');
+	$response = array();
 
 	// Default is non-broken HTTP server implementation
-	$GLOBALS['is_http_server_broken'] = false;
+	$GLOBALS['is_http_server_broken'] = FALSE;
 
 	// Load include
 	loadIncludeOnce('inc/classes/resolver.class.php');
@@ -322,43 +337,46 @@ function sendRawRequest ($host, $request) {
 		$port = $portArray[1];
 	} elseif (count($portArray) > 2) {
 		// This should not happen!
-		debug_report_bug(__FUNCTION__, __LINE__, 'Invalid ' . $host . '. Please report this to the Mailer-Project team.');
+		reportBug(__FUNCTION__, __LINE__, 'Invalid ' . $host . '. Please report this to the Mailer-Project team.');
 	}
 
 	// Get resolver instance
 	$resolver = new HostnameResolver();
 
+	// Get proxy host
+	$proxyHost = compileRawCode(getProxyHost());
+
 	// Open connection
-	if (isProxyUsed() === true) {
+	if (isProxyUsed() === TRUE) {
 		// Resolve hostname into IP address
-		$ip = $resolver->resolveHostname(compileRawCode(getProxyHost()));
+		$ip = $resolver->resolveHostname($proxyHost);
 
 		// Connect to host through proxy connection
-		$fp = fsockopen($ip, bigintval(getProxyPort()), $errno, $errdesc, 30);
+		$resource = fsockopen($ip, bigintval(getProxyPort()), $errno, $errdesc, 30);
 	} else {
 		// Resolve hostname into IP address
 		$ip = $resolver->resolveHostname($host);
 
 		// Connect to host directly
-		$fp = fsockopen($ip, $port, $errno, $errdesc, 30);
+		$resource = fsockopen($ip, $port, $errno, $errdesc, 30);
 	}
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ip=' . $ip . ',host=' . $host . ',isProxyUsed()=' . intval(isProxyUsed()));
 
 	// Is there a link?
-	if (!is_resource($fp)) {
+	if (!is_resource($resource)) {
 		// Failed!
 		logDebugMessage(__FUNCTION__, __LINE__, $errdesc . ' (' . $errno . ')');
-		return $response;
-	} elseif ((!stream_set_blocking($fp, 0)) || (!stream_set_timeout($fp, 1))) {
+		return array('', '', '');
+	} elseif ((!stream_set_blocking($resource, 0)) || (!stream_set_timeout($resource, 1))) {
 		// Cannot set non-blocking mode or timeout
 		logDebugMessage(__FUNCTION__, __LINE__, socket_strerror(socket_last_error()));
-		return $response;
+		return array('', '', '');
 	}
 
-	// Do we use proxy?
-	if (isProxyUsed() === true) {
+	// Shall proxy be used?
+	if (isProxyUsed() === TRUE) {
 		// Setup proxy tunnel
-		$response = setupProxyTunnel($host, $port, $fp);
+		$response = setupProxyTunnel($host, $proxyHost, $port, $resource);
 
 		// If the response is invalid, abort
 		if ((count($response) == 3) && (empty($response[0])) && (empty($response[1])) && (empty($response[2]))) {
@@ -369,18 +387,18 @@ function sendRawRequest ($host, $request) {
 	} // END - if
 
 	// Write request
-	fwrite($fp, $request);
+	fwrite($resource, $request);
 
 	// Start counting
-	$start = microtime(true);
+	$start = microtime(TRUE);
 
 	// Read response
-	while (!feof($fp)) {
+	while (!feof($resource)) {
 		// Get info from stream
-		$info = stream_get_meta_data($fp);
+		$info = stream_get_meta_data($resource);
 
 		// Is it timed out? 15 seconds is a really patient...
-		if (($info['timed_out'] == true) || (microtime(true) - $start) > 15) {
+		if (($info['timed_out'] == TRUE) || (microtime(TRUE) - $start) > 15) {
 			// Timeout
 			logDebugMessage(__FUNCTION__, __LINE__, 'Timed out to get data from host ' . $host);
 
@@ -389,10 +407,13 @@ function sendRawRequest ($host, $request) {
 		} // END - if
 
 		// Get line from stream
-		$line = fgets($fp, 128);
+		$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);
 
@@ -407,51 +428,35 @@ function sendRawRequest ($host, $request) {
 		} // END - if
 
 		// Add it to response
-		//* DEBUG: */ print 'line='.$line.'<br />';
-		$response[] = $line;
+		//* DEBUG: */ print 'line(' . strlen($line) . ')='.$line.'<br />';
+		array_push($response, $line);
 	} // END - while
 
 	// Close socket
-	fclose($fp);
+	fclose($resource);
 
 	// Time request if debug-mode is enabled
 	if (isDebugModeEnabled()) {
 		// Add debug message...
-		logDebugMessage(__FUNCTION__, __LINE__, 'Request took ' . (microtime(true) - $start) . ' seconds and returned ' . count($response) . ' line(s).');
+		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>');
+	//* DEBUG: */ debugOutput('<strong>Request:</strong><pre>'.print_r($request, TRUE).'</pre>');
+	//* DEBUG: */ debugOutput('<strong>Response:</strong><pre>'.print_r($response, TRUE).'</pre>');
 
 	// Proxy agent found or something went wrong?
-	if (!isset($response[0])) {
+	if (!isFilledArray($response)) {
 		// No response, maybe timeout
 		$response = array('', '', '');
 		logDebugMessage(__FUNCTION__, __LINE__, 'Invalid empty response array, maybe timed out?');
-	} elseif ((substr(strtolower($response[0]), 0, 11) == 'proxy-agent') && (isProxyUsed() === true)) {
+	} elseif ((substr(strtolower($response[0]), 0, 11) == 'proxy-agent') && (isProxyUsed() === TRUE)) {
 		// Proxy header detected, so remove two lines
 		array_shift($response);
 		array_shift($response);
 	} // END - if
 
 	// Was the request successfull?
-	if ((!isInStringIgnoreCase('200 OK', $response[0])) || (empty($response[0]))) {
+	if ((!isHttpStatusOkay($response[0])) && ($allowOnlyHttpOkay === TRUE)) {
 		// Not found / access forbidden
 		logDebugMessage(__FUNCTION__, __LINE__, 'Unexpected status code ' . $response[0] . ' detected. "200 OK" was expected.');
 		$response = array('', '', '');
@@ -464,14 +469,21 @@ function sendRawRequest ($host, $request) {
 	return $response;
 }
 
+// Is HTTP status okay?
+function isHttpStatusOkay ($header) {
+	// Determine it
+	return in_array(strtoupper(trim($header)), array('HTTP/1.1 200 OK', 'HTTP/1.0 200 OK'));
+}
+
 // Sets up a proxy tunnel for given hostname and through resource
-function setupProxyTunnel ($host, $port, $resource) {
+function setupProxyTunnel ($host, $proxyHost, $port, $resource) {
 	// Initialize array
 	$response = array('', '', '');
 
 	// Generate CONNECT request header
 	$proxyTunnel  = 'CONNECT ' . $host . ':' . $port . ' HTTP/1.0' . getConfig('HTTP_EOL');
 	$proxyTunnel .= 'Host: ' . $host . getConfig('HTTP_EOL');
+	$proxyTunnel .= 'Proxy-Connection: Keep-Alive' . getConfig('HTTP_EOL');
 
 	// Use login data to proxy? (username at least!)
 	if (getProxyUsername() != '') {
@@ -485,18 +497,18 @@ function setupProxyTunnel ($host, $port, $resource) {
 	//* DEBUG: */ debugOutput('<strong>proxyTunnel=</strong><pre>' . $proxyTunnel.'</pre>');
 
 	// Write request
-	fwrite($fp, $proxyTunnel);
+	fwrite($resource, $proxyTunnel);
 
 	// Got response?
-	if (feof($fp)) {
+	if (feof($resource)) {
 		// No response received
 		return $response;
 	} // END - if
 
 	// Read the first line
-	$resp = trim(fgets($fp, 10240));
+	$resp = trim(fgets($resource, 10240));
 	$respArray = explode(' ', $resp);
-	if ((strtolower($respArray[0]) !== 'http/1.0') || ($respArray[1] != '200')) {
+	if (((strtolower($respArray[0]) !== 'http/1.0') && (strtolower($respArray[0]) !== 'http/1.1')) || ($respArray[1] != '200')) {
 		// Invalid response!
 		return $response;
 	} // END - if
@@ -508,7 +520,7 @@ function setupProxyTunnel ($host, $port, $resource) {
 // Check array for chuncked encoding
 function unchunkHttpResponse ($response) {
 	// Default is not chunked
-	$isChunked = false;
+	$isChunked = FALSE;
 
 	// Check if we have chunks
 	foreach ($response as $line) {
@@ -518,29 +530,62 @@ function unchunkHttpResponse ($response) {
 		// Entry found?
 		if ((isInStringIgnoreCase('transfer-encoding', $line)) && (isInStringIgnoreCase('chunked', $line))) {
 			// Found!
-			$isChunked = true;
+			$isChunked = TRUE;
 			break;
-		} // END - if
+		} elseif (empty($line)) {
+			// Empty line found (header->body)
+			break;
+		}
 	} // END - foreach
 
+	// Save whole body
+	$body = removeHttpHeaderFromResponse($response);
+
 	// Is it chunked?
-	if ($isChunked === true) {
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'isChunked=' . intval($isChunked));
+	if ($isChunked === TRUE) {
+		// Make sure, that body is an array
+		assert(is_array($body));
+
 		// Good, we still have the HTTP headers in there, so we need to get rid
 		// of them temporarly
-		//* DEBUG: */ die('<pre>'.htmlentities(print_r(removeHttpHeaderFromResponse($response), true)).'</pre>');
-		$tempResponse = http_chunked_decode(implode('', removeHttpHeaderFromResponse($response)));
+		//* DEBUG: */ die('<pre>'.htmlentities(print_r(removeHttpHeaderFromResponse($response), TRUE)).'</pre>');
+		$tempResponse = http_chunked_decode(implode('', $body));
 
 		// We got a string back from http_chunked_decode(), so we need to convert it back to an array
-		//* DEBUG: */ die('tempResponse['.strlen($tempResponse).']=<pre>'.replaceReturnNewLine(htmlentities($tempResponse)).'</pre>');
+		//* DEBUG: */ die('tempResponse['.strlen($tempResponse).'/'.gettype($tempResponse).']=<pre>'.replaceReturnNewLine(htmlentities($tempResponse)).'</pre>');
 
 		// Re-add the headers
-		$response = merge_array($GLOBALS['http_headers'], stringToArray("\n", $tempResponse));
-	} // END - if
+		$response = mergeHttpHeadersWithBody($tempResponse);
+	} elseif (is_array($body)) {
+		/*
+		 * Make sure the body is in one array element as many other functions
+		 * get disturbed by it.
+		 */
+
+		// Put all array elements from body together
+		$body = implode('', $body);
+
+		// Now merge the extracted headers + fixed body together
+		$response = mergeHttpHeadersWithBody($body);
+	}
 
 	// Return the unchunked array
 	return $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(isFilledArray($GLOBALS['http_headers']));
+
+	// Merge both together
+	return merge_array($GLOBALS['http_headers'], array(count($GLOBALS['http_headers']) => $body));
+}
+
 // Removes HTTP header lines from a response array (e.g. output from send<Get|Post>Request() )
 function removeHttpHeaderFromResponse ($response) {
 	// Save headers for later usage
@@ -554,9 +599,6 @@ function removeHttpHeaderFromResponse ($response) {
 			// Remove line
 			array_shift($response2);
 
-			// Add full line to temporary global array
-			$GLOBALS['http_headers'][] = $line;
-
 			// Trim it for testing
 			$lineTest = trim($line);
 
@@ -565,6 +607,15 @@ function removeHttpHeaderFromResponse ($response) {
 				// Then stop here
 				break;
 			} // END - if
+
+			// 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
@@ -578,7 +629,7 @@ function removeHttpHeaderFromResponse ($response) {
 // Returns the flag if a broken HTTP server implementation was detected
 function isBrokenHttpServerImplentation () {
 	// Determine it
-	$isBroken = ((isset($GLOBALS['is_http_server_broken'])) && ($GLOBALS['is_http_server_broken'] === true));
+	$isBroken = ((isset($GLOBALS['is_http_server_broken'])) && ($GLOBALS['is_http_server_broken'] === TRUE));
 
 	// ... and return it
 	return $isBroken;
@@ -599,11 +650,20 @@ function extractHostnameFromUrl (&$script) {
 	} // END - if
 
 	// Extract host name
-	$host = str_replace('http://', '', $url);
+	$host = str_replace(array('http://', 'https://'), array('', ''), $url);
+
+	// Is there a slash at the end?
 	if (isInString('/', $host)) {
 		$host = substr($host, 0, strpos($host, '/'));
 	} // END - if
 
+	// Is there a double-dot in? (Means port number)
+	if (strpos($host, ':') !== FALSE) {
+		// Detected a double-dot
+		$hostArray = explode(':', $host);
+		$host = $hostArray[0];
+	} // END - if
+
 	// Generate relative URL
 	//* DEBUG: */ debugOutput('SCRIPT=' . $script);
 	if (substr(strtolower($script), 0, 7) == 'http://') {
@@ -627,7 +687,7 @@ function extractHostnameFromUrl (&$script) {
 function addHttpHeader ($header) {
 	// Send the header
 	//* DEBUG: */ logDebugMessage(__FUNCTION__ . ': header=' . $header);
-	$GLOBALS['http_header'][] = trim($header);
+	array_push($GLOBALS['http_header'], trim($header));
 }
 
 // Flushes all HTTP headers
@@ -635,15 +695,17 @@ function flushHttpHeaders () {
 	// Is the header already sent?
 	if (headers_sent()) {
 		// Then abort here
-		debug_report_bug(__FUNCTION__, __LINE__, 'Headers already sent!');
-	} // END - if
+		reportBug(__FUNCTION__, __LINE__, 'Headers already sent!');
+	} elseif ((!isset($GLOBALS['http_header'])) || (!is_array($GLOBALS['http_header']))) {
+		// Not set or not an array
+		reportBug(__FUNCTION__, __LINE__, 'Headers not set or not an array, isset()=' . isset($GLOBALS['http_header']) . ', please report this.');
+	}
 
 	// Flush all headers if found
-	if ((isset($GLOBALS['http_header'])) && (is_array($GLOBALS['http_header']))) {
-		foreach ($GLOBALS['http_header'] as $header) {
-			header($header);
-		} // END - foreach
-	} // END - if
+	foreach ($GLOBALS['http_header'] as $header) {
+		// Send a single header
+		header($header);
+	} // END - foreach
 
 	// Mark them as flushed
 	$GLOBALS['http_header'] = array();
@@ -658,7 +720,7 @@ if (!function_exists('http_build_query')) {
 	function http_build_query($requestData, $prefix = '', $sep = '', $key = '') {
 		$ret = array();
 		foreach ((array) $requestData as $k => $v) {
-			if (is_int($k) && $prefix != null) {
+			if (is_int($k) && !is_null($prefix)) {
 				$k = urlencode($prefix . $k);
 			} // END - if
 
@@ -686,7 +748,7 @@ if (!function_exists('http_chunked_decode')) {
 	 * dechunk an HTTP 'transfer-encoding: chunked' message.
 	 *
 	 * @param	$chunk		The encoded message
-	 * @return	$dechunk	The decoded message. If $chunk wasn't encoded properly debug_report_bug() is being called
+	 * @return	$dechunk	The decoded message. If $chunk wasn't encoded properly reportBug() is being called
 	 * @author	Marques Johansson (initial author)
 	 * @author	Roland Haeder (heavy modifications and simplification)
 	 * @link	http://php.net/manual/en/function.http-chunked-decode.php#89786
@@ -725,7 +787,7 @@ next[offset,10]=<pre>'.replaceReturnNewLine(htmlentities(call_user_func_array($m
 			if (!isHexadecimal($chunkLenHex)) {
 				// Please help debugging this
 				//* DEBUG: */ die('ABORT:chunkLenHex=<pre>'.replaceReturnNewLine(htmlentities($chunkLenHex)).'</pre>');
-				debug_report_bug(__FUNCTION__, __LINE__, 'Value ' . $chunkLenHex . ' is no valid hexa-decimal string.');
+				reportBug(__FUNCTION__, __LINE__, 'Value ' . $chunkLenHex . ' is no valid hexa-decimal string.');
 
 				// This won't be reached
 				return $chunk;
@@ -799,5 +861,80 @@ next[100]=<pre>'.replaceReturnNewLine(htmlentities(call_user_func_array($mbPrefi
 	}
 } // END - if
 
+// Getter for request method
+function getHttpRequestMethod () {
+	// Console is default
+	$requestMethod = 'console';
+
+	// Is it set?
+	if (isset($_SERVER['REQUEST_METHOD'])) {
+		// Get current request method
+		$requestMethod = $_SERVER['REQUEST_METHOD'];
+	} // END - if
+
+	// Return it
+	return $requestMethod;
+}
+
+// Checks if 'content_type' is set
+function isContentTypeSet () {
+	return isset($GLOBALS['content_type']);
+}
+
+// Setter for content type
+function setContentType ($contentType) {
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'contentType=' . $contentType);
+	$GLOBALS['content_type'] = (string) $contentType;
+}
+
+// Getter for content type
+function getContentType () {
+	// Is it there?
+	if (!isContentTypeSet()) {
+		// Please fix this
+		reportBug(__FUNCTION__, __LINE__, 'content_type not set in GLOBALS array.');
+	} // END - if
+
+	// Return it
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'content_type=' . $GLOBALS['content_type']);
+	return $GLOBALS['content_type'];
+}
+
+// Logs wrong SERVER_NAME attempts
+function logWrongServerNameRedirect () {
+	// Is ext-sql_patches at least version 0.9.2?
+	if (isExtensionInstalledAndNewer('sql_patches', '0.9.2')) {
+		// Is there an entry?
+		if (countSumTotalData(detectServerName(), 'server_name_log', 'server_name_id', 'server_name', TRUE, str_replace('%', '{PER}', sprintf(" AND `server_name_remote_addr`='%s' AND `server_name_ua`='%s' AND `server_name_referrer`='%s'", sqlEscapeString(detectRemoteAddr(TRUE)), sqlEscapeString(detectUserAgent(TRUE)), sqlEscapeString(detectReferer(TRUE))))) == 1) {
+			// Update counter, as all are the same
+			sqlQueryEscaped("UPDATE
+	`{?_MYSQL_PREFIX?}_server_name_log`
+SET
+	`server_name_counter`=`server_name_counter`+1
+WHERE
+	`server_name`='%s' AND
+	`server_name_remote_addr`='%s' AND
+	`server_name_ua`='%s' AND
+	`server_name_referrer`='%s'
+LIMIT 1",
+				array(
+					detectServerName(),
+					detectRemoteAddr(TRUE),
+					detectUserAgent(TRUE),
+					detectReferer(TRUE)
+				), __FUNCTION__, __LINE__);
+		} else {
+			// Then log it away
+			sqlQueryEscaped("INSERT INTO `{?_MYSQL_PREFIX?}_server_name_log` (`server_name`, `server_name_remote_addr`, `server_name_ua`, `server_name_referrer`) VALUES('%s','%s', '%s', '%s')",
+				array(
+					detectServerName(),
+					detectRemoteAddr(TRUE),
+					detectUserAgent(TRUE),
+					detectReferer(TRUE)
+				), __FUNCTION__, __LINE__);
+		}
+	} // END - if
+}
+
 // [EOF]
 ?>