X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fhttp-functions.php;h=c8cdf7acf37d476c7529655a904a6f4c276b569b;hp=c1518e2ed5c9d0c33de79181eee61ed49891685b;hb=63f159414369b5ea19a8ca75d8cd8033c45d8341;hpb=a454def0bfba8288ffc839d034c710f034cf4728
diff --git a/inc/http-functions.php b/inc/http-functions.php
index c1518e2ed5..c8cdf7acf3 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 - 2012 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,17 +60,18 @@ 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');
- // There shall be no output mode in raw/AJAX mode
- if ((!isRawOutputMode()) && (!isAjaxOutputMode())) {
- // Send content-type only in CSS/HTML mode
+
+ // 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');
- } else {
- //
} // 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?
if (!isset($GLOBALS[__FUNCTION__][$url])) {
@@ -156,7 +163,7 @@ function sendHttpRequest ($requestType, $baseUrl, $requestData = array(), $remov
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
@@ -248,8 +255,8 @@ 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 sendPostRequest ($baseUrl, $requestData = array(), $removeHeader = false) {
// Copy baseUrl to getUrl
$getUrl = $baseUrl;
@@ -328,7 +335,7 @@ 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
@@ -417,7 +424,7 @@ function sendRawRequest ($host, $request) {
// Add it to response
//* DEBUG: */ print 'line='.$line.'
';
- $response[] = $line;
+ array_push($response, $line);
} // END - while
// Close socket
@@ -544,7 +551,7 @@ function unchunkHttpResponse ($response) {
//* DEBUG: */ die('tempResponse['.strlen($tempResponse).']='.replaceReturnNewLine(htmlentities($tempResponse)).'
');
// Re-add the headers
- $response = merge_array($GLOBALS['http_headers'], stringToArray("\n", $tempResponse));
+ $response = merge_array($GLOBALS['http_headers'], stringToArray(chr(10), $tempResponse));
} // END - if
// Return the unchunked array
@@ -565,7 +572,7 @@ function removeHttpHeaderFromResponse ($response) {
array_shift($response2);
// Add full line to temporary global array
- $GLOBALS['http_headers'][] = $line;
+ array_push($GLOBALS['http_headers'], $line);
// Trim it for testing
$lineTest = trim($line);
@@ -637,7 +644,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
@@ -645,15 +652,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();
@@ -696,7 +705,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
@@ -735,7 +744,7 @@ next[offset,10]='.replaceReturnNewLine(htmlentities(call_user_func_array($m
if (!isHexadecimal($chunkLenHex)) {
// Please help debugging this
//* DEBUG: */ die('ABORT:chunkLenHex='.replaceReturnNewLine(htmlentities($chunkLenHex)).'
');
- 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;
@@ -809,5 +818,44 @@ next[100]='.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'];
+}
+
// [EOF]
?>