- (non-)ZTS fixes
[m6w6/ext-http] / php_http.h
index e59d0c241e72d42b3a3d63dbe4463ca49f527688..4bd31d74c03829dec7033abc49f8264a5c0b3b5d 100644 (file)
@@ -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-2006, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
 */
 
 /* $Id$ */
 #ifndef PHP_EXT_HTTP_H
 #define PHP_EXT_HTTP_H
 
-#define HTTP_PEXT_VERSION "0.15.0"
+#define PHP_EXT_HTTP_VERSION "1.3.0dev"
 
-/* make compile on Win32 */
-#ifdef HTTP_HAVE_CURL
+#ifdef HAVE_CONFIG_H
+#      include "config.h"
+#else
+#      ifndef PHP_WIN32
+#              include "php_config.h"
+#      endif
+#endif
+
+#include "php.h"
+#include "missing.h"
+#include "php_http_std_defs.h"
+#include "phpstr/phpstr.h"
+
+#ifdef HTTP_WANT_SAPI
+#      if PHP_API_VERSION > 20041225
+#              define HTTP_HAVE_SAPI_RTIME
+#      endif
+#      include "SAPI.h"
+#endif
+
+#ifdef HTTP_WANT_NETDB
+#      ifdef PHP_WIN32
+#              define HTTP_HAVE_NETDB
+#              include <winsock2.h>
+#      elif defined(HAVE_NETDB_H)
+#              define HTTP_HAVE_NETDB
+#              include <netdb.h>
+#              ifdef HAVE_UNISTD_H
+#                      include <unistd.h>
+#              endif
+#      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>
+#      define HTTP_CURL_VERSION(x, y, z) (LIBCURL_VERSION_NUM >= (((x)<<16) + ((y)<<8) + (z)))
 #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 +79,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;
@@ -49,6 +88,7 @@ ZEND_BEGIN_MODULE_GLOBALS(http)
        struct _http_globals_log {
                char *cache;
                char *redirect;
+               char *not_found;
                char *allowed_methods;
                char *composite;
        } log;
@@ -59,44 +99,82 @@ ZEND_BEGIN_MODULE_GLOBALS(http)
                char *content_type;
                char *unquoted_etag;
                time_t last_modified;
+               struct _http_globals_send_deflate {
+                       zend_bool start_auto;
+                       long start_flags;
+                       int encoding;
+                       void *stream;
+               } deflate;
+               struct _http_globals_send_inflate {
+                       zend_bool start_auto;
+                       long start_flags;
+                       void *stream;
+               } inflate;
+               zend_bool not_found_404;
        } send;
 
        struct _http_globals_request {
+               time_t time;
                struct _http_globals_request_methods {
                        char *allowed;
-                       HashTable custom;
+                       struct _http_globals_request_methods_custom {
+                               char *ini;
+                               int count;
+                               void *entries;
+                       } 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 */
+#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL)
+               struct _http_globals_request_datashare {
+                       zend_llist handles;
+                       zend_bool cookie;
+                       zend_bool dns;
+                       zend_bool ssl;
+                       zend_bool connect;
+               } datashare;
+#endif
        } request;
 
+#ifdef ZEND_ENGINE_2
+       zend_bool only_exceptions;
+#endif
+
+       zend_bool force_exit;
+       zend_bool read_post_data;
+
 ZEND_END_MODULE_GLOBALS(http)
 
+ZEND_EXTERN_MODULE_GLOBALS(http);
+
 #ifdef ZTS
 #      include "TSRM.h"
-#      define HTTP_G(v) TSRMG(http_globals_id, zend_http_globals *, v)
-#      define HTTP_GLOBALS ((zend_http_globals *) (*((void ***) tsrm_ls))[TSRM_UNSHUFFLE_RSRC_ID(http_globals_id)])
+#      define HTTP_G ((zend_http_globals *) (*((void ***) tsrm_ls))[TSRM_UNSHUFFLE_RSRC_ID(http_globals_id)])
 #else
-#      define HTTP_G(v) (http_globals.v)
-#      define HTTP_GLOBALS (&http_globals)
+#      define HTTP_G (&http_globals)
+#endif
+
+#if defined(HAVE_ICONV) && (HTTP_SHARED_DEPS || !defined(COMPILE_DL_ICONV))
+#      define HTTP_HAVE_ICONV
+#endif
+
+#if defined(HAVE_PHP_SESSION) && (HTTP_SHARED_DEPS || !defined(COMPILE_DL_SESSION))
+#      define HTTP_HAVE_SESSION
+#endif
+
+#if defined(HAVE_HASH_EXT) && (HTTP_SHARED_DEPS || !defined(COMPILE_DL_HASH)) && defined(HTTP_HAVE_PHP_HASH_H)
+#      define HTTP_HAVE_HASH
+#endif
+
+#if defined(HAVE_SPL)
+#      define HTTP_HAVE_SPL
 #endif
-#define getGlobals(G) zend_http_globals *G = HTTP_GLOBALS;
 
 PHP_FUNCTION(http_test);
 PHP_FUNCTION(http_date);
-PHP_FUNCTION(http_build_uri);
+PHP_FUNCTION(http_build_url);
+PHP_FUNCTION(http_build_str);
 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);
@@ -113,41 +191,37 @@ PHP_FUNCTION(http_send_stream);
 PHP_FUNCTION(http_chunked_decode);
 PHP_FUNCTION(http_parse_message);
 PHP_FUNCTION(http_parse_headers);
+PHP_FUNCTION(http_parse_cookie);
+PHP_FUNCTION(http_build_cookie);
+PHP_FUNCTION(http_parse_params);
 PHP_FUNCTION(http_get_request_headers);
 PHP_FUNCTION(http_get_request_body);
+PHP_FUNCTION(http_get_request_body_stream);
 PHP_FUNCTION(http_match_request_header);
 #ifdef HTTP_HAVE_CURL
 PHP_FUNCTION(http_get);
 PHP_FUNCTION(http_head);
 PHP_FUNCTION(http_post_data);
 PHP_FUNCTION(http_post_fields);
+PHP_FUNCTION(http_put_data);
 PHP_FUNCTION(http_put_file);
 PHP_FUNCTION(http_put_stream);
+PHP_FUNCTION(http_request);
+PHP_FUNCTION(http_request_body_encode);
 #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);
-#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);
+PHP_FUNCTION(ob_deflatehandler);
+PHP_FUNCTION(ob_inflatehandler);
 #endif
 PHP_FUNCTION(http_support);
 
-PHP_MINIT_FUNCTION(http);
-PHP_MSHUTDOWN_FUNCTION(http);
-PHP_RINIT_FUNCTION(http);
-PHP_RSHUTDOWN_FUNCTION(http);
-PHP_MINFO_FUNCTION(http);
-
 #endif /* PHP_HTTP_H */
 
 /*