X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http.h;h=8e724af7ba09dcd259b6d08f46754dcbcd4ece4c;hp=2d436076c330055204d6aba5817330cd3788871f;hb=376bdc3230e8f6d2b8f167d4534e1dc8d0e0fc68;hpb=7ba82df3144551af4182de7e515f955b9b1a68a9

diff --git a/php_http.h b/php_http.h
index 2d43607..8e724af 100644
--- a/php_http.h
+++ b/php_http.h
@@ -15,17 +15,41 @@
 #ifndef PHP_EXT_HTTP_H
 #define PHP_EXT_HTTP_H
 
-#define HTTP_PEXT_VERSION "0.17.0"
+#define PHP_EXT_HTTP_VERSION "0.20.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>
 #	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
@@ -34,11 +58,8 @@ extern int http_module_number;
 
 ZEND_BEGIN_MODULE_GLOBALS(http)
 
-#ifdef ZEND_ENGINE_2
-	zend_bool only_exceptions;
-#endif
 	struct _http_globals_etag {
-		long mode;
+		char *mode;
 		void *ctx;
 		zend_bool started;
 	} etag;
@@ -78,6 +99,12 @@ ZEND_BEGIN_MODULE_GLOBALS(http)
 #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
@@ -95,6 +122,7 @@ PHP_FUNCTION(http_date);
 PHP_FUNCTION(http_build_uri);
 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);