X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fhttp-functions.php;h=36f0296eab2ae6045f84da8abc0f529ab6ad98c7;hb=798d1b4557e774a74b7d8e3795dad2a46532b592;hp=b0cbca319d79501193253058fab94b37f113ff3e;hpb=7360c219f5623e5689deba8805b49dbba6c3bc2a;p=mailer.git

diff --git a/inc/http-functions.php b/inc/http-functions.php
index b0cbca319d..36f0296eab 100644
--- a/inc/http-functions.php
+++ b/inc/http-functions.php
@@ -17,7 +17,7 @@
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -58,18 +58,42 @@ function sendHttpHeaders () {
 	sendHeader('Content-Language: ' . getLanguage());
 }
 
-// Send a GET request
-function sendGetRequest ($script, $data = array(), $removeHeader = false) {
-	// Extract hostname and port from script
-	$host = extractHostnameFromUrl($script);
+// Checks wether the URL is full-qualified (http[s]:// + hostname [+ request data])
+function isFullQualifiedUrl ($url) {
+	// Do we have cache?
+	if (!isset($GLOBALS[__FUNCTION__][$url])) {
+		// Determine it
+		$GLOBALS[__FUNCTION__][$url] = ((substr($url, 0, 7) == 'http://') || (substr($url, 0, 8) == 'https://'));
+	} // END - if
+
+	// Return cache
+	return $GLOBALS[__FUNCTION__][$url];
+}
+
+// Generates the full GET URL from given base URL and data array
+function generateGetUrlFromBaseUrlData ($baseUrl, $requestData = array()) {
+	// Init URL
+	$getUrl = $baseUrl;
+
+	// Is it full-qualified?
+	if (!isFullQualifiedUrl($getUrl)) {
+		// Need to prepend a slash?
+		if (substr($getUrl, 0, 1) != '/') {
+			// Prepend it
+			$getUrl = '/' . $getUrl;
+		} // END - if
+
+		// Prepend http://hostname from mxchange.org server
+		$getUrl = getServerUrl() . $getUrl;
+	} // END - if
 
 	// Add data
-	$body = http_build_query($data, '', '&');
+	$body = http_build_query($requestData, '', '&');
 
-	// There should be data, else we don't need to extend $script with $body
+	// 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?
-		if (strpos($script, '?') === false) {
+		if (!isInString('?', $baseUrl)) {
 			// No, so first char must be question mark
 			$body = '?' . $body;
 		} else {
@@ -78,16 +102,92 @@ function sendGetRequest ($script, $data = array(), $removeHeader = false) {
 		}
 
 		// Add script data
-		$script .= $body;
+		$getUrl .= $body;
 
 		// Remove trailed & to make it more conform
-		if (substr($script, -1, 1) == '&') {
-			$script = substr($script, 0, -1);
+		if (substr($getUrl, -1, 1) == '&') {
+			$getUrl = substr($getUrl, 0, -1);
 		} // END - if
 	} // END - if
 
+	// Return it
+	return $getUrl;
+}
+
+// Removes http[s]://<hostname> from given url
+function removeHttpHostNameFromUrl ($url) {
+	// Remove http[s]://
+	$remove = explode(':', $url);
+	$remove = explode('/', substr($remove[1], 3));
+
+	// Remove the first element (should be the hostname)
+	unset($remove[0]);
+
+	// implode() back all other elements and prepend a slash
+	$url = '/' . implode('/', $remove);
+
+	// Return prepared URL
+	return $url;
+}
+
+// Send a HEAD request
+function sendHeadRequest ($baseUrl, $requestData = array()) {
+	// Generate full GET URL
+	$getUrl = generateGetUrlFromBaseUrlData($baseUrl, $requestData);
+
+	// Do we have http[s]:// in front of the URL?
+	if (isFullQualifiedUrl($getUrl)) {
+		// Remove http[s]://<hostname> from url
+		$getUrl = removeHttpHostNameFromUrl($getUrl);
+	} elseif (substr($getUrl, 0, 1) != '/') {
+		// Prepend a slash
+		$getUrl = '/' . $getUrl;
+	}
+
+	// Extract hostname and port from script
+	$host = extractHostnameFromUrl($baseUrl);
+
+	// Generate HEAD request header
+	$request  = 'HEAD ' . 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')) {
+		$request .= 'User-Agent: ' . getTitle() . '/' . getFullVersion() . getConfig('HTTP_EOL');
+	} else {
+		$request .= 'User-Agent: ' . getTitle() . '/' . getConfig('VERSION') . getConfig('HTTP_EOL');
+	}
+	$request .= 'Accept: image/png,image/*;q=0.8,text/plain,text/html,*/*;q=0.5' . getConfig('HTTP_EOL');
+	$request .= 'Accept-Charset: UTF-8,*' . getConfig('HTTP_EOL');
+	$request .= 'Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0' . getConfig('HTTP_EOL');
+	$request .= 'Connection: close' . getConfig('HTTP_EOL');
+	$request .= getConfig('HTTP_EOL');
+
+	// Send the raw request
+	$response = sendRawRequest($host, $request);
+
+	// Return the result to the caller function
+	return $response;
+}
+
+// Send a GET request
+function sendGetRequest ($baseUrl, $requestData = array(), $removeHeader = false) {
+	// Generate full GET URL
+	$getUrl = generateGetUrlFromBaseUrlData($baseUrl, $requestData);
+
+	// Do we have http[s]:// in front of the URL?
+	if (isFullQualifiedUrl($getUrl)) {
+		// Remove http[s]://<hostname> from url
+		$getUrl = removeHttpHostNameFromUrl($getUrl);
+	} elseif (substr($getUrl, 0, 1) != '/') {
+		// Prepend a slash
+		$getUrl = '/' . $getUrl;
+	}
+
+	// Extract hostname and port from script
+	$host = extractHostnameFromUrl($baseUrl);
+
 	// Generate GET request header
-	$request  = 'GET /' . trim($script) . ' HTTP/1.1' . getConfig('HTTP_EOL');
+	$request  = 'GET ' . 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')) {
@@ -115,21 +215,37 @@ function sendGetRequest ($script, $data = array(), $removeHeader = false) {
 }
 
 // Send a POST request
-function sendPostRequest ($script, array $postData, $removeHeader = false) {
+function sendPostRequest ($baseUrl, $requestData, $removeHeader = false) {
+	// Copy baseUrl to getUrl
+	$getUrl = $baseUrl;
+
+	// Do we have http[s]:// in front of the URL?
+	if (isFullQualifiedUrl($getUrl)) {
+		// Remove http[s]://<hostname> from url
+		$getUrl = removeHttpHostNameFromUrl($getUrl);
+	} elseif (substr($getUrl, 0, 1) != '/') {
+		// Prepend a slash
+		$getUrl = '/' . $getUrl;
+	}
+
 	// Extract host name from script
-	$host = extractHostnameFromUrl($script);
+	$host = extractHostnameFromUrl($baseUrl);
 
 	// Construct request body
-	$body = http_build_query($postData, '', '&');
+	$body = http_build_query($requestData, '', '&');
 
 	// Generate POST request header
-	$request  = 'POST /' . trim($script) . ' HTTP/1.0' . getConfig('HTTP_EOL');
+	$request  = 'POST ' . trim($baseUrl) . ' HTTP/1.0' . getConfig('HTTP_EOL');
 	$request .= 'Host: ' . $host . getConfig('HTTP_EOL');
 	$request .= 'Referer: ' . getUrl() . '/admin.php' . getConfig('HTTP_EOL');
-	$request .= 'User-Agent: ' . getTitle() . '/' . getFullVersion() . getConfig('HTTP_EOL');
+	if (isConfigEntrySet('FULL_VERSION')) {
+		$request .= 'User-Agent: ' . getTitle() . '/' . getFullVersion() . getConfig('HTTP_EOL');
+	} else {
+		$request .= 'User-Agent: ' . getTitle() . '/' . getConfig('VERSION') . getConfig('HTTP_EOL');
+	}
 	$request .= 'Accept: text/plain;q=0.8' . getConfig('HTTP_EOL');
 	$request .= 'Accept-Charset: UTF-8,*' . getConfig('HTTP_EOL');
-	$request .= 'Cache-Control: no-cache' . getConfig('HTTP_EOL');
+	$request .= 'Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0' . getConfig('HTTP_EOL');
 	$request .= 'Content-Type: application/x-www-form-urlencoded' . getConfig('HTTP_EOL');
 	$request .= 'Content-Length: ' . strlen($body) . getConfig('HTTP_EOL');
 	$request .= 'Connection: close' . getConfig('HTTP_EOL');
@@ -151,8 +267,9 @@ function sendPostRequest ($script, array $postData, $removeHeader = false) {
 	return $response;
 }
 
-// Sends a raw request to another host
+// Sends a raw request (string) to given host (hostnames will be solved)
 function sendRawRequest ($host, $request) {
+	//* DEBUG: */ die('host='.$host.',request=<pre>'.$request.'</pre>');
 	// Init errno and errdesc with 'all fine' values
 	$errno = '0';
 	$errdesc = '';
@@ -193,7 +310,6 @@ function sendRawRequest ($host, $request) {
 	$resolver = new HostnameResolver();
 
 	// Open connection
-	//* DEBUG: */ die('SCRIPT=' . $script);
 	if ($useProxy === true) {
 		// Resolve hostname into IP address
 		$ip = $resolver->resolveHostname(compileRawCode(getProxyHost()));
@@ -267,10 +383,11 @@ function sendRawRequest ($host, $request) {
 		// Check for broken HTTP implementations
 		if (substr(strtolower($line), 0, 7) == 'server:') {
 			// Anomic (see http://anomic.de, http://yacy.net) is currently broken
-			$GLOBALS['is_http_server_broken'] = in_array(trim(substr(strtolower($line), 7)), array('anomichttpd'));
+			$GLOBALS['is_http_server_broken'] = (count(getArrayKeysFromSubStrArray(strtolower($line), array('anomichttpd'))) > 0);
 		} // END - if
 
 		// Add it to response
+		//* DEBUG: */ print 'line='.$line.'<br />';
 		$response[] = $line;
 	} // END - while
 
@@ -369,17 +486,17 @@ function setupProxyTunnel ($host, $port, $resource) {
 }
 
 // Check array for chuncked encoding
-function unchunkHttpResponse (array $response) {
+function unchunkHttpResponse ($response) {
 	// Default is not chunked
 	$isChunked = false;
 
 	// Check if we have chunks
 	foreach ($response as $line) {
 		// Make lower-case and trim it
-		$line = trim(strtolower($line));
+		$line = trim($line);
 
 		// Entry found?
-		if ((strpos($line, 'transfer-encoding') !== false) && (strpos($line, 'chunked') !== false)) {
+		if ((isInStringIgnoreCase('transfer-encoding', $line)) && (isInStringIgnoreCase('chunked', $line))) {
 			// Found!
 			$isChunked = true;
 			break;
@@ -405,7 +522,7 @@ function unchunkHttpResponse (array $response) {
 }
 
 // Removes HTTP header lines from a response array (e.g. output from send<Get|Post>Request() )
-function removeHttpHeaderFromResponse (array $response) {
+function removeHttpHeaderFromResponse ($response) {
 	// Save headers for later usage
 	$GLOBALS['http_headers'] = array();
 
@@ -453,9 +570,9 @@ function isBrokenHttpServerImplentation () {
 
 if (!function_exists('http_build_query')) {
 	// Taken from documentation on www.php.net, credits to Marco K. (Germany) and some light mods by R.Haeder
-	function http_build_query($data, $prefix = '', $sep = '', $key = '') {
+	function http_build_query($requestData, $prefix = '', $sep = '', $key = '') {
 		$ret = array();
-		foreach ((array) $data as $k => $v) {
+		foreach ((array) $requestData as $k => $v) {
 			if (is_int($k) && $prefix != null) {
 				$k = urlencode($prefix . $k);
 			} // END - if
@@ -467,7 +584,7 @@ if (!function_exists('http_build_query')) {
 			if (is_array($v) || is_object($v)) {
 				array_push($ret, http_build_query($v, '', $sep, $k));
 			} else {
-				array_push($ret, $k.'='.urlencode($v));
+				array_push($ret, $k . '=' . urlencode($v));
 			}
 		} // END - foreach
 
@@ -485,7 +602,8 @@ if (!function_exists('http_chunked_decode')) {
 	 *
 	 * @param	$chunk		The encoded message
 	 * @return	$dechunk	The decoded message. If $chunk wasn't encoded properly debug_report_bug() is being called
-	 * @author	Marques Johansson
+	 * @author	Marques Johansson (initial author)
+	 * @author	Roland Haeder (heavy modifications and simplification)
 	 * @link	http://php.net/manual/en/function.http-chunked-decode.php#89786
 	 */
 	function http_chunked_decode ($chunk) {
@@ -543,8 +661,9 @@ offset[<em>'.__LINE__.'</em>]='.$offset.'<br />';
 
 			/*
 			 * Hack for e.g. YaCy HTTPDaemon (Anomic Server), this HTTP server
-			 * is currently (revision 7567) broken and does not include the \r\n
-			 * characters when it does sent "chunked" messages.
+			 * is currently (revision 7567 and maybe earlier) broken and does
+			 * not include the \r\n characters when it sents a "chunked" HTTP
+			 * message.
 			 */
 			$count = 0;
 			if (isBrokenHttpServerImplentation()) {
@@ -552,7 +671,11 @@ offset[<em>'.__LINE__.'</em>]='.$offset.'<br />';
 				$count = call_user_func_array($mbPrefix . 'substr_count', array($next, getConfig('HTTP_EOL')));
 			} // END - if
 
-			// Correct it because we need to subtract occurrences of \r\n
+			/*
+			 * Correct chunk length because some broken HTTP server
+			 * implementation subtract occurrences of \r\n in their chunk
+			 * lengths.
+			 */
 			$chunkLen = hexdec(rtrim($chunkLenHex, getConfig('HTTP_EOL'))) - ($count * strlen(getConfig('HTTP_EOL')));
 
 			// Add next chunk to $dechunk
@@ -575,7 +698,7 @@ chunk=<pre>'.replaceReturnNewLine(htmlentities($chunk)).'</pre>');
 				break;
 			} // END - if
 
-			// Calculate next offset of chunk
+			// Calculate offset of next chunk
 			$offset = call_user_func_array($mbPrefix . 'strpos', array($chunk, getConfig('HTTP_EOL'), $offset + $chunkLen)) + 2;
 
 			/* DEBUG: *
@@ -591,5 +714,44 @@ next[100]=<pre>'.replaceReturnNewLine(htmlentities(call_user_func_array($mbPrefi
 	}
 } // END - if
 
+// Extract host from script name
+function extractHostnameFromUrl (&$script) {
+	// Use default SERVER_URL by default... ;) So?
+	$url = getServerUrl();
+
+	// Is this URL valid?
+	if (substr($script, 0, 7) == 'http://') {
+		// Use the hostname from script URL as new hostname
+		$url = substr($script, 7);
+		$extract = explode('/', $url);
+		$url = $extract[0];
+		// Done extracting the URL :)
+	} // END - if
+
+	// Extract host name
+	$host = str_replace('http://', '', $url);
+	if (isInString('/', $host)) {
+		$host = substr($host, 0, strpos($host, '/'));
+	} // END - if
+
+	// Generate relative URL
+	//* DEBUG: */ debugOutput('SCRIPT=' . $script);
+	if (substr(strtolower($script), 0, 7) == 'http://') {
+		// But only if http:// is in front!
+		$script = substr($script, (strlen($url) + 7));
+	} elseif (substr(strtolower($script), 0, 8) == 'https://') {
+		// Does this work?!
+		$script = substr($script, (strlen($url) + 8));
+	}
+
+	//* DEBUG: */ debugOutput('SCRIPT=' . $script);
+	if (substr($script, 0, 1) == '/') {
+		$script = substr($script, 1);
+	} // END - if
+
+	// Return host name
+	return $host;
+}
+
 // [EOF]
 ?>