- added INI setting http.force_exit which can be used to disable script termination

[m6w6/ext-http] / php_http.h

diff --git a/php_http.h b/php_http.h
index 9137b812c6eecb7036535f8ed42169d1fdb3f53b..b62777ee4f93552c0d2d4c443f1e1270bbd85f54 100644 (file)
--- 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,7 +15,7 @@
 #ifndef PHP_EXT_HTTP_H
 #define PHP_EXT_HTTP_H
 
-#define HTTP_PEXT_VERSION "0.12.0dev"
+#define HTTP_PEXT_VERSION "0.18.0dev"
 
 /* make compile on Win32 */
 #ifdef HTTP_HAVE_CURL
@@ -27,8 +24,7 @@
 #      endif
 #      include <curl/curl.h>
 #endif
-#include "ext/standard/md5.h"
-#include "ext/standard/sha1.h"
+
 #include "phpstr/phpstr.h"
 
 extern zend_module_entry http_module_entry;
@@ -38,9 +34,6 @@ 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;
                void *ctx;
@@ -48,7 +41,6 @@ ZEND_BEGIN_MODULE_GLOBALS(http)
        } etag;
 
        struct _http_globals_log {
-               char *auth;
                char *cache;
                char *redirect;
                char *allowed_methods;
@@ -61,6 +53,7 @@ ZEND_BEGIN_MODULE_GLOBALS(http)
                char *content_type;
                char *unquoted_etag;
                time_t last_modified;
+               int gzip_encoding;
        } send;
 
        struct _http_globals_request {
@@ -76,12 +69,18 @@ ZEND_BEGIN_MODULE_GLOBALS(http)
                        zend_llist contexts;
                        zend_llist convs;
                } copies;
-#      if LIBCURL_VERSION_NUM < 0x070c00
+#      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
@@ -96,7 +95,7 @@ ZEND_END_MODULE_GLOBALS(http)
 
 PHP_FUNCTION(http_test);
 PHP_FUNCTION(http_date);
-PHP_FUNCTION(http_absolute_uri);
+PHP_FUNCTION(http_build_uri);
 PHP_FUNCTION(http_negotiate_language);
 PHP_FUNCTION(http_negotiate_charset);
 PHP_FUNCTION(http_redirect);
@@ -125,18 +124,24 @@ PHP_FUNCTION(http_post_data);
 PHP_FUNCTION(http_post_fields);
 PHP_FUNCTION(http_put_file);
 PHP_FUNCTION(http_put_stream);
-/*PHP_FUNCTION(http_request)*/
+#endif /* HTTP_HAVE_CURL */
 PHP_FUNCTION(http_request_method_register);
 PHP_FUNCTION(http_request_method_unregister);
 PHP_FUNCTION(http_request_method_exists);
 PHP_FUNCTION(http_request_method_name);
-#endif /* HTTP_HAVE_CURL */
-PHP_FUNCTION(http_auth_basic);
-PHP_FUNCTION(http_auth_basic_cb);
 #ifndef ZEND_ENGINE_2
 PHP_FUNCTION(http_build_query);
 #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);
 
 PHP_MINIT_FUNCTION(http);
 PHP_MSHUTDOWN_FUNCTION(http);