X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fhttp-functions.php;h=e82ca2ce198709458fd5bd41d98eb0cac2c7b1ed;hb=61621983cc6d7195fcc7eab29b5f6080ff283b34;hp=727211d59b834ca789d0d2b9023f52344dde1a7f;hpb=175b3f506e193d8d791ec6523db42276e296dd0b;p=mailer.git

diff --git a/inc/http-functions.php b/inc/http-functions.php
index 727211d59b..e82ca2ce19 100644
--- a/inc/http-functions.php
+++ b/inc/http-functions.php
@@ -10,13 +10,8 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : HTTP-relevante Funktionen                        *
  * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2016 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -278,7 +273,7 @@ function sendHttpPostRequest ($baseUrl, $requestData = array(), $removeHeader =
 	$body = http_build_query($requestData, '', '&');
 
 	// Generate POST request header
-	$request  = 'POST ' . (isProxyUsed() === TRUE ? $baseUrl : '') . trim($baseUrl) . ' HTTP/1.0' . getConfig('HTTP_EOL');
+	$request  = 'POST ' . (isProxyUsed() === TRUE ? $getUrl : '') . trim($getUrl) . ' HTTP/1.0' . getConfig('HTTP_EOL');
 	$request .= 'Host: ' . $host . getConfig('HTTP_EOL');
 	$request .= 'Referer: ' . getUrl() . '/admin.php' . getConfig('HTTP_EOL');
 	if (isConfigEntrySet('FULL_VERSION')) {
@@ -343,8 +338,14 @@ function sendRawRequest ($host, $request, $allowOnlyHttpOkay = TRUE) {
 	// Get resolver instance
 	$resolver = new HostnameResolver();
 
-	// Get proxy host
-	$proxyHost = compileRawCode(getProxyHost());
+	// Default is no proxy
+	$proxyHost = NULL;
+
+	// Is the configuration entry set?
+	if ((!isInstaller()) && (isConfigEntrySet('proxy_host'))) {
+		// Get proxy host
+		$proxyHost = compileRawCode(getProxyHost());
+	} // END - if
 
 	// Open connection
 	if (isProxyUsed() === TRUE) {
@@ -545,7 +546,7 @@ function unchunkHttpResponse ($response) {
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'isChunked=' . intval($isChunked));
 	if ($isChunked === TRUE) {
 		// Make sure, that body is an array
-		assert(is_array($body), 'body[]=' . gettype($body) . ' must be an array.');
+		assert(is_array($body));
 
 		// Good, we still have the HTTP headers in there, so we need to get rid
 		// of them temporarly
@@ -643,11 +644,13 @@ function extractHostnameFromUrl (&$script) {
 	// 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);
+		$extract = explode('/', substr($script, 7));
 		$url = $extract[0];
-		// Done extracting the URL :)
-	} // END - if
+	} elseif (substr($script, 0, 8) == 'https://') {
+		// Use the hostname from script URL as new hostname
+		$extract = explode('/', substr($script, 8));
+		$url = $extract[0];
+	}
 
 	// Extract host name
 	$host = str_replace(array('http://', 'https://'), array('', ''), $url);
@@ -686,7 +689,7 @@ function extractHostnameFromUrl (&$script) {
 // Adds a HTTP header to array
 function addHttpHeader ($header) {
 	// Send the header
-	//* DEBUG: */ logDebugMessage(__FUNCTION__ . ': header=' . $header);
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, ': header=' . $header);
 	array_push($GLOBALS['http_header'], trim($header));
 }
 
@@ -936,5 +939,17 @@ LIMIT 1",
 	} // END - if
 }
 
+// Check if response status OK and array index 'response' is set
+function isHttpResponseStatusOkay ($response) {
+	// Assertion on array
+	assert(is_array($response));
+
+	// Test it
+	$isOkay = ((isset($response['status'])) && ($response['status'] == 'OK'));
+
+	// Return result
+	return $isOkay;
+}
+
 // [EOF]
 ?>