#ifndef PHP_EXT_HTTP_H
#define PHP_EXT_HTTP_H
-#define HTTP_PEXT_VERSION "0.8.0-dev"
+#define HTTP_PEXT_VERSION "0.12.0dev"
/* make compile on Win32 */
#ifdef HTTP_HAVE_CURL
extern zend_module_entry http_module_entry;
#define phpext_http_ptr &http_module_entry
+extern int http_module_number;
+
ZEND_BEGIN_MODULE_GLOBALS(http)
- zend_bool etag_started;
- PHP_MD5_CTX etag_md5;
- php_stream_statbuf ssb;
- char *ctype;
- char *etag;
- time_t lmod;
- char *allowed_methods;
+
+#ifdef ZEND_ENGINE_2
+ zend_bool only_exceptions;
+#endif
+ struct _http_globals_etag {
+ zend_bool started;
+ PHP_MD5_CTX md5ctx;
+ } etag;
+
+ struct _http_globals_log {
+ char *cache;
+ } log;
+
+ struct _http_globals_send {
+ double throttle_delay;
+ size_t buffer_size;
+ char *content_type;
+ char *unquoted_etag;
+ time_t last_modified;
+ } send;
+
+ struct _http_globals_request {
+ struct _http_globals_request_methods {
+ char *allowed;
+ HashTable custom;
+ } methods;
+
#ifdef HTTP_HAVE_CURL
- phpstr curlbuf;
+ struct _http_globlas_request_copies {
+ zend_llist strings;
+ zend_llist slists;
+ zend_llist contexts;
+ zend_llist convs;
+ } copies;
# if LIBCURL_VERSION_NUM < 0x070c00
- char curlerr[CURL_ERROR_SIZE + 1];
+ char error[CURL_ERROR_SIZE + 1];
# endif
- zend_llist to_free;
#endif /* HTTP_HAVE_CURL */
+ } request;
+
ZEND_END_MODULE_GLOBALS(http)
#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)])
#else
# define HTTP_G(v) (http_globals.v)
+# define HTTP_GLOBALS (&http_globals)
#endif
+#define getGlobals(G) zend_http_globals *G = HTTP_GLOBALS;
PHP_FUNCTION(http_test);
PHP_FUNCTION(http_date);
PHP_FUNCTION(http_negotiate_language);
PHP_FUNCTION(http_negotiate_charset);
PHP_FUNCTION(http_redirect);
+PHP_FUNCTION(http_throttle);
PHP_FUNCTION(http_send_status);
PHP_FUNCTION(http_send_last_modified);
PHP_FUNCTION(http_send_content_type);
PHP_FUNCTION(http_send_stream);
PHP_FUNCTION(http_chunked_decode);
PHP_FUNCTION(http_split_response);
+PHP_FUNCTION(http_parse_message);
PHP_FUNCTION(http_parse_headers);
PHP_FUNCTION(http_get_request_headers);
+PHP_FUNCTION(http_get_request_body);
+PHP_FUNCTION(http_match_request_header);
#ifdef HTTP_HAVE_CURL
PHP_FUNCTION(http_get);
PHP_FUNCTION(http_head);
PHP_FUNCTION(http_post_data);
-PHP_FUNCTION(http_post_array);
+PHP_FUNCTION(http_post_fields);
+PHP_FUNCTION(http_put_file);
+PHP_FUNCTION(http_put_stream);
+/*PHP_FUNCTION(http_request)*/
+PHP_FUNCTION(http_request_method_register);
+PHP_FUNCTION(http_request_method_unregister);
+PHP_FUNCTION(http_request_method_exists);
+PHP_FUNCTION(http_request_method_name);
#endif /* HTTP_HAVE_CURL */
PHP_FUNCTION(http_auth_basic);
PHP_FUNCTION(http_auth_basic_cb);
#ifndef ZEND_ENGINE_2
PHP_FUNCTION(http_build_query);
#endif /* ZEND_ENGINE_2 */
-PHP_FUNCTION(ob_httpetaghandler);
+PHP_FUNCTION(ob_etaghandler);
PHP_MINIT_FUNCTION(http);
PHP_MSHUTDOWN_FUNCTION(http);