Heacy rewrite/cleanup:

[mailer.git] / inc / http-functions.php

diff --git a/inc/http-functions.php b/inc/http-functions.php
index 8932af62882342f0f92a76a06851f3444404b592..4fc66c95a5a94a4850f1af9106d3a284b9e34ace 100644 (file)
--- 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?
        //* 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?');
                // 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)
        $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));
 
        // Merge both together
        return merge_array($GLOBALS['http_headers'], array(count($GLOBALS['http_headers']) => $body));