- fix http_get_request_body()

[m6w6/ext-http] / php_http.h

diff --git a/php_http.h b/php_http.h
index b0a0a149d5e74798854485fcb7c29d7ba1f82004..0fbbb55172a76353b650536c6c04c0dc0dfde6ea 100644 (file)
--- a/php_http.h
+++ b/php_http.h
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2005, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2006, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -15,7 +15,7 @@
 #ifndef PHP_EXT_HTTP_H
 #define PHP_EXT_HTTP_H
 
-#define PHP_EXT_HTTP_VERSION "0.21.0dev"
+#define PHP_EXT_HTTP_VERSION "0.22.0-dev"
 
 #include "php.h"
 #include "php_http_std_defs.h"
@@ -24,8 +24,10 @@
 
 #ifdef HTTP_WANT_NETDB
 #      ifdef PHP_WIN32
+#              define HTTP_HAVE_NETDB
 #              include <winsock2.h>
 #      elif defined(HAVE_NETDB_H)
+#              define HTTP_HAVE_NETDB
 #              include <netdb.h>
 #      endif
 #endif
@@ -93,7 +95,10 @@ ZEND_BEGIN_MODULE_GLOBALS(http)
        struct _http_globals_request {
                struct _http_globals_request_methods {
                        char *allowed;
-                       HashTable custom;
+                       struct _http_globals_request_methods_custom {
+                               int count;
+                               void *entries;
+                       } custom;
                } methods;
        } request;
 
@@ -102,6 +107,7 @@ ZEND_BEGIN_MODULE_GLOBALS(http)
 #endif
 
        zend_bool force_exit;
+       zend_bool read_post_data;
 
 ZEND_END_MODULE_GLOBALS(http)
 
@@ -115,7 +121,7 @@ ZEND_EXTERN_MODULE_GLOBALS(http);
 #      define HTTP_G(v) (http_globals.v)
 #      define HTTP_GLOBALS (&http_globals)
 #endif
-#define getGlobals(G) zend_http_globals *G = HTTP_GLOBALS;
+#define getGlobals(G) zend_http_globals *G = HTTP_GLOBALS
 
 PHP_FUNCTION(http_test);
 PHP_FUNCTION(http_date);
@@ -142,6 +148,7 @@ PHP_FUNCTION(http_parse_headers);
 PHP_FUNCTION(http_parse_cookie);
 PHP_FUNCTION(http_get_request_headers);
 PHP_FUNCTION(http_get_request_body);
+PHP_FUNCTION(http_get_request_body_stream);
 PHP_FUNCTION(http_match_request_header);
 #ifdef HTTP_HAVE_CURL
 PHP_FUNCTION(http_get);