#ifndef PHP_EXT_HTTP_H
#define PHP_EXT_HTTP_H
-#define HTTP_PEXT_VERSION "0.18.0dev"
+#define PHP_EXT_HTTP_VERSION "0.21.0dev"
-/* make compile on Win32 */
-#ifdef HTTP_HAVE_CURL
+#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>
+# elif defined(HAVE_NETDB_H)
+# include <netdb.h>
+# endif
+#endif
+
+#if defined(HTTP_WANT_CURL) && defined(HTTP_HAVE_CURL)
# ifdef PHP_WIN32
# include <winsock2.h>
+# define CURL_STATICLIB
# endif
# include <curl/curl.h>
#endif
-#include "phpstr/phpstr.h"
+#if defined(HTTP_WANT_MAGIC) && defined(HTTP_HAVE_MAGIC)
+# if defined(PHP_WIN32) && !defined(USE_MAGIC_DLL) && !defined(USE_MAGIC_STATIC)
+# define USE_MAGIC_STATIC
+# endif
+# include <magic.h>
+#endif
+
+#if defined(HTTP_WANT_ZLIB) && defined(HTTP_HAVE_ZLIB)
+# include <zlib.h>
+#endif
+
+#include <ctype.h>
extern zend_module_entry http_module_entry;
#define phpext_http_ptr &http_module_entry
ZEND_BEGIN_MODULE_GLOBALS(http)
struct _http_globals_etag {
- long mode;
+ char *mode;
void *ctx;
zend_bool started;
} etag;
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_bool only_exceptions;
#endif
+ zend_bool force_exit;
+
ZEND_END_MODULE_GLOBALS(http)
#ifdef ZTS
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_redirect);
PHP_FUNCTION(http_throttle);
PHP_FUNCTION(http_send_status);
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);
#endif
PHP_FUNCTION(http_support);