#ifndef PHP_EXT_HTTP_H
#define PHP_EXT_HTTP_H
-#define HTTP_PEXT_VERSION "0.9.0dev"
+#define HTTP_PEXT_VERSION "0.12.0dev"
/* make compile on Win32 */
#ifdef HTTP_HAVE_CURL
# endif
# include <curl/curl.h>
#endif
-#include "ext/standard/md5.h"
+
#include "phpstr/phpstr.h"
extern zend_module_entry http_module_entry;
ZEND_BEGIN_MODULE_GLOBALS(http)
+#ifdef ZEND_ENGINE_2
+ zend_bool only_exceptions;
+#endif
struct _http_globals_etag {
+ long mode;
+ void *ctx;
zend_bool started;
- PHP_MD5_CTX md5ctx;
} etag;
struct _http_globals_log {
+ char *auth;
char *cache;
+ char *redirect;
+ char *allowed_methods;
+ char *composite;
} log;
struct _http_globals_send {
} methods;
#ifdef HTTP_HAVE_CURL
- struct _http_globals_request_curl {
- zend_llist copies;
+ struct _http_globals_request_copies {
+ zend_llist strings;
+ zend_llist slists;
+ zend_llist contexts;
+ zend_llist convs;
+ } copies;
# if LIBCURL_VERSION_NUM < 0x070c00
- char error[CURL_ERROR_SIZE + 1];
+ char error[CURL_ERROR_SIZE + 1];
# endif
- } curl;
#endif /* HTTP_HAVE_CURL */
} request;
# 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
+# define HTTP_GLOBALS (&http_globals)
#endif
#define getGlobals(G) zend_http_globals *G = HTTP_GLOBALS;
PHP_FUNCTION(http_send_file);
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);