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

diff --git a/inc/http-functions.php b/inc/http-functions.php
index 8ae5daa783..4fc66c95a5 100644
--- a/inc/http-functions.php
+++ b/inc/http-functions.php
@@ -445,7 +445,7 @@ function sendRawRequest ($host, $request, $allowOnlyHttpOkay = TRUE) {
 	//* DEBUG: */ debugOutput('<strong>Response:</strong><pre>'.print_r($response, TRUE).'</pre>');
 
 	// Proxy agent found or something went wrong?
-	if (count($response) == 0) {
+	if (!isFilledArray($response)) {
 		// No response, maybe timeout
 		$response = array('', '', '');
 		logDebugMessage(__FUNCTION__, __LINE__, 'Invalid empty response array, maybe timed out?');
@@ -580,7 +580,7 @@ function mergeHttpHeadersWithBody ($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));
+	assert(isFilledArray($GLOBALS['http_headers']));
 
 	// Merge both together
 	return merge_array($GLOBALS['http_headers'], array(count($GLOBALS['http_headers']) => $body));
@@ -650,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://') {