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

diff --git a/php_http.h b/php_http.h
index c1bca86..8e724af 100644
--- a/php_http.h
+++ b/php_http.h
@@ -1,16 +1,13 @@
 /*
-   +----------------------------------------------------------------------+
-   | PECL :: http                                                         |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.0 of the PHP license, that  |
-   | is bundled with this package in the file LICENSE, and is available   |
-   | through the world-wide-web at http://www.php.net/license/3_0.txt.    |
-   | If you did not receive a copy of the PHP license and are unable to   |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@php.net so we can mail you a copy immediately.               |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 2004-2005 Michael Wallner <mike@php.net>               |
-   +----------------------------------------------------------------------+
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2005, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
 */
 
 /* $Id$ */
@@ -18,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>
 #	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
@@ -37,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;
@@ -81,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
@@ -98,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);