X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_functions.c;h=cdddb81143d9ba91bb68227da1ac58674a510f2d;hb=389e280e0bba312ff5ca9981801cc842dad26ec2;hp=69f03e17a4d75ff0b7582800ec18fc015e3fc8c5;hpb=df90736032e1dace78ea996502cc0f69806909e2;p=m6w6%2Fext-http

diff --git a/http_functions.c b/http_functions.c
index 69f03e1..cdddb81 100644
--- a/http_functions.c
+++ b/http_functions.c
@@ -12,17 +12,12 @@
 
 /* $Id$ */
 
-#ifdef HAVE_CONFIG_H
-#	include "config.h"
-#endif
-
+#define HTTP_WANT_SAPI
 #define HTTP_WANT_CURL
 #define HTTP_WANT_ZLIB
 #include "php_http.h"
 
-#include "SAPI.h"
 #include "php_ini.h"
-#include "ext/standard/info.h"
 #include "ext/standard/php_string.h"
 #include "zend_operators.h"
 
@@ -46,8 +41,8 @@
  * Compose a valid HTTP date regarding RFC 822/1123
  * looking like: "Wed, 22 Dec 2004 11:34:47 GMT"
  *
- * Takes an optional unix timestamp as parameter.
- *  
+ * Accepts an optional unix timestamp as parameter.
+ *
  * Returns the HTTP date as string.
  */
 PHP_FUNCTION(http_date)
@@ -59,7 +54,7 @@ PHP_FUNCTION(http_date)
 	}
 
 	if (t == -1) {
-		t = (long) time(NULL);
+		t = (long) HTTP_GET_REQUEST_TIME();
 	}
 
 	RETURN_STRING(http_date(t), 0);
@@ -376,7 +371,7 @@ PHP_FUNCTION(http_send_last_modified)
 	}
 
 	if (t == -1) {
-		t = (long) time(NULL);
+		t = (long) HTTP_GET_REQUEST_TIME();
 	}
 
 	RETURN_SUCCESS(http_send_last_modified(t));
@@ -456,7 +451,7 @@ PHP_FUNCTION(http_match_modified)
 
 	// current time if not supplied (senseless though)
 	if (t == -1) {
-		t = (long) time(NULL);
+		t = (long) HTTP_GET_REQUEST_TIME();
 	}
 
 	if (for_range) {
@@ -524,7 +519,7 @@ PHP_FUNCTION(http_cache_last_modified)
 	
 	HTTP_CHECK_HEADERS_SENT(RETURN_FALSE);
 
-	t = (long) time(NULL);
+	t = (long) HTTP_GET_REQUEST_TIME();
 
 	/* 0 or omitted */
 	if (!last_modified) {
@@ -1020,7 +1015,10 @@ PHP_FUNCTION(http_get_request_headers)
  *
  * Get the raw request body (e.g. POST or PUT data).
  * 
- * Returns NULL when using the CLI SAPI.
+ * This function can not be used after http_get_request_body_stream() 
+ * if the request method was another than POST.
+ * 
+ * Returns the raw request body as string on success or NULL on failure.
  */
 PHP_FUNCTION(http_get_request_body)
 {
@@ -1037,6 +1035,29 @@ PHP_FUNCTION(http_get_request_body)
 }
 /* }}} */
 
+/* {{{ proto resource http_get_request_body_stream(void)
+ *
+ * Create a stream to read the raw request body (e.g. POST or PUT data).
+ * 
+ * This function can only be used once if the request method was another than POST.
+ * 
+ * Returns the raw request body as stream on success or NULL on failure.
+ */
+PHP_FUNCTION(http_get_request_body_stream)
+{
+	php_stream *s;
+	
+	NO_ARGS;
+	
+	if ((s = http_get_request_body_stream())) {
+		php_stream_to_zval(s, return_value);
+	} else {
+		http_error(HE_WARNING, HTTP_E_RUNTIME, "Failed to create request body stream");
+		RETURN_NULL();
+	}
+}
+/* }}} */
+
 /* {{{ proto bool http_match_request_header(string header, string value[, bool match_case = false])
  *
  * Match an incoming HTTP header.