- adjust ini entry names to those of the globals struct

[m6w6/ext-http] / php_http.h

diff --git a/php_http.h b/php_http.h
index 4aa2679dd2ccb5a7b76574c7422f0ba43085dd7c..4e2a7c67bc5e0c2b49f418b354c39224af60e1b8 100644 (file)
--- a/php_http.h
+++ b/php_http.h
@@ -15,7 +15,7 @@
 #ifndef PHP_EXT_HTTP_H
 #define PHP_EXT_HTTP_H
 
 #ifndef PHP_EXT_HTTP_H
 #define PHP_EXT_HTTP_H
 

-#define PHP_EXT_HTTP_VERSION "0.23.0dev"
+#define PHP_EXT_HTTP_VERSION "1.0.0RC5-dev"

 
 #ifdef HAVE_CONFIG_H
 #      include "config.h"
 
 #ifdef HAVE_CONFIG_H
 #      include "config.h"


@@ -35,7 +35,7 @@
 #              define HTTP_HAVE_SAPI_RTIME
 #              define HTTP_GET_REQUEST_TIME() sapi_get_request_time(TSRMLS_C)
 #      else
 #              define HTTP_HAVE_SAPI_RTIME
 #              define HTTP_GET_REQUEST_TIME() sapi_get_request_time(TSRMLS_C)
 #      else

-#              define HTTP_GET_REQUEST_TIME() HTTP_G(request_time)
+#              define HTTP_GET_REQUEST_TIME() HTTP_G->request_time

 #      endif
 #      include "SAPI.h"
 #endif
 #      endif
 #      include "SAPI.h"
 #endif


@@ -59,6 +59,7 @@
 #              define CURL_STATICLIB
 #      endif
 #      include <curl/curl.h>
 #              define CURL_STATICLIB
 #      endif
 #      include <curl/curl.h>

+#      define HTTP_CURL_VERSION(x, y, z) (LIBCURL_VERSION_NUM >= (((x)<<16) + ((y)<<8) + (z)))

 #endif
 
 #if defined(HTTP_WANT_MAGIC) && defined(HTTP_HAVE_MAGIC)
 #endif
 
 #if defined(HTTP_WANT_MAGIC) && defined(HTTP_HAVE_MAGIC)


@@ -117,6 +118,7 @@ ZEND_BEGIN_MODULE_GLOBALS(http)
                struct _http_globals_request_methods {
                        char *allowed;
                        struct _http_globals_request_methods_custom {
                struct _http_globals_request_methods {
                        char *allowed;
                        struct _http_globals_request_methods_custom {

+                               char *ini;

                                int count;
                                void *entries;
                        } custom;
                                int count;
                                void *entries;
                        } custom;


@@ -139,13 +141,10 @@ ZEND_EXTERN_MODULE_GLOBALS(http);
 
 #ifdef ZTS
 #      include "TSRM.h"
 
 #ifdef ZTS
 #      include "TSRM.h"

-#      define HTTP_G(v) TSRMG(http_globals_id, zend_http_globals *, v)
-#      define HTTP_GLOBALS ((zend_http_globals *) (*((void ***) tsrm_ls))[TSRM_UNSHUFFLE_RSRC_ID(http_globals_id)])
+#      define HTTP_G ((zend_http_globals *) (*((void ***) tsrm_ls))[TSRM_UNSHUFFLE_RSRC_ID(http_globals_id)])

 #else
 #else

-#      define HTTP_G(v) (http_globals.v)
-#      define HTTP_GLOBALS (&http_globals)
+#      define HTTP_G (&http_globals)

 #endif
 #endif

-#define getGlobals(G) zend_http_globals *G = HTTP_GLOBALS

 
 PHP_FUNCTION(http_test);
 PHP_FUNCTION(http_date);
 
 PHP_FUNCTION(http_test);
 PHP_FUNCTION(http_date);


@@ -171,6 +170,7 @@ PHP_FUNCTION(http_chunked_decode);
 PHP_FUNCTION(http_parse_message);
 PHP_FUNCTION(http_parse_headers);
 PHP_FUNCTION(http_parse_cookie);
 PHP_FUNCTION(http_parse_message);
 PHP_FUNCTION(http_parse_headers);
 PHP_FUNCTION(http_parse_cookie);

+PHP_FUNCTION(http_parse_params);

 PHP_FUNCTION(http_get_request_headers);
 PHP_FUNCTION(http_get_request_body);
 PHP_FUNCTION(http_get_request_body_stream);
 PHP_FUNCTION(http_get_request_headers);
 PHP_FUNCTION(http_get_request_body);
 PHP_FUNCTION(http_get_request_body_stream);


@@ -180,8 +180,11 @@ PHP_FUNCTION(http_get);
 PHP_FUNCTION(http_head);
 PHP_FUNCTION(http_post_data);
 PHP_FUNCTION(http_post_fields);
 PHP_FUNCTION(http_head);
 PHP_FUNCTION(http_post_data);
 PHP_FUNCTION(http_post_fields);

+PHP_FUNCTION(http_put_data);

 PHP_FUNCTION(http_put_file);
 PHP_FUNCTION(http_put_stream);
 PHP_FUNCTION(http_put_file);
 PHP_FUNCTION(http_put_stream);

+PHP_FUNCTION(http_request);
+PHP_FUNCTION(http_request_body_encode);

 #endif /* HTTP_HAVE_CURL */
 PHP_FUNCTION(http_request_method_register);
 PHP_FUNCTION(http_request_method_unregister);
 #endif /* HTTP_HAVE_CURL */
 PHP_FUNCTION(http_request_method_register);
 PHP_FUNCTION(http_request_method_unregister);


@@ -196,12 +199,6 @@ PHP_FUNCTION(ob_inflatehandler);
 #endif
 PHP_FUNCTION(http_support);
 
 #endif
 PHP_FUNCTION(http_support);
 

-PHP_MINIT_FUNCTION(http);
-PHP_MSHUTDOWN_FUNCTION(http);
-PHP_RINIT_FUNCTION(http);
-PHP_RSHUTDOWN_FUNCTION(http);
-PHP_MINFO_FUNCTION(http);
-

 #endif /* PHP_HTTP_H */
 
 /*
 #endif /* PHP_HTTP_H */
 
 /*