#ifndef PHP_EXT_HTTP_H
#define PHP_EXT_HTTP_H
-#define PHP_EXT_HTTP_VERSION "0.20.0dev"
+#define PHP_EXT_HTTP_VERSION "0.21.0dev"
#include "php.h"
#include "php_http_std_defs.h"
#include "phpstr/phpstr.h"
#include "missing.h"
-
#ifdef HTTP_WANT_NETDB
# ifdef PHP_WIN32
# include <winsock2.h>
#if defined(HTTP_WANT_CURL) && defined(HTTP_HAVE_CURL)
# ifdef PHP_WIN32
# include <winsock2.h>
+# define CURL_STATICLIB
# endif
# include <curl/curl.h>
#endif
char *content_type;
char *unquoted_etag;
time_t last_modified;
- int gzip_encoding;
+ struct _http_globals_send_deflate {
+ zend_bool start_auto;
+ long start_flags;
+ int encoding;
+ void *stream;
+ } deflate;
+ struct _http_globals_send_inflate {
+ zend_bool start_auto;
+ long start_flags;
+ void *stream;
+ } inflate;
} send;
struct _http_globals_request {
char *allowed;
HashTable custom;
} methods;
-
-#ifdef HTTP_HAVE_CURL
- struct _http_globals_request_copies {
- zend_llist strings;
- zend_llist slists;
- zend_llist contexts;
- zend_llist convs;
- } copies;
-# ifndef HAVE_CURL_EASY_STRERROR
- char error[CURL_ERROR_SIZE + 1];
-# endif
-#endif /* HTTP_HAVE_CURL */
} request;
#ifdef ZEND_ENGINE_2
ZEND_END_MODULE_GLOBALS(http)
+ZEND_EXTERN_MODULE_GLOBALS(http);
+
#ifdef ZTS
# include "TSRM.h"
# define HTTP_G(v) TSRMG(http_globals_id, zend_http_globals *, v)
PHP_FUNCTION(http_test);
PHP_FUNCTION(http_date);
-PHP_FUNCTION(http_build_uri);
+PHP_FUNCTION(http_build_url);
PHP_FUNCTION(http_negotiate_language);
PHP_FUNCTION(http_negotiate_charset);
PHP_FUNCTION(http_negotiate_content_type);
PHP_FUNCTION(http_chunked_decode);
PHP_FUNCTION(http_parse_message);
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_match_request_header);
#endif /* ZEND_ENGINE_2 */
PHP_FUNCTION(ob_etaghandler);
#ifdef HTTP_HAVE_ZLIB
-PHP_FUNCTION(http_gzencode);
-PHP_FUNCTION(http_gzdecode);
PHP_FUNCTION(http_deflate);
PHP_FUNCTION(http_inflate);
-PHP_FUNCTION(http_compress);
-PHP_FUNCTION(http_uncompress);
+PHP_FUNCTION(ob_deflatehandler);
+PHP_FUNCTION(ob_inflatehandler);
#endif
PHP_FUNCTION(http_support);