X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=php_http.h;h=dce7b5982899ea34bf6b934b6690478a8bd341af;hb=649aada485583ccac67928e0700cb5f1b963f4e8;hp=6f38c156cf6f86024c508f2b821a5f2c30208018;hpb=e83a7438dc70ed96630887246a1d3aefcf155b1c;p=m6w6%2Fext-http

diff --git a/php_http.h b/php_http.h
index 6f38c15..dce7b59 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.16.1dev"
+#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>
+#		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
@@ -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;
@@ -64,20 +85,14 @@ ZEND_BEGIN_MODULE_GLOBALS(http)
 			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
@@ -95,6 +110,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);