X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http.h;h=08b2a4db4009ae7b908fa5bf4552c48e13ee8420;hp=1801943a64d2488941343b6cb355c85d1e51bb38;hb=46fc12676a53668d55fe6d02d44210e2eaf4b6b5;hpb=edc84b40eb2c5be04492fa98fec5833a030782eb diff --git a/php_http.h b/php_http.h index 1801943..08b2a4d 100644 --- a/php_http.h +++ b/php_http.h @@ -6,7 +6,7 @@ | modification, are permitted provided that the conditions mentioned | | in the accompanying LICENSE file are met. | +--------------------------------------------------------------------+ - | Copyright (c) 2004-2005, Michael Wallner | + | Copyright (c) 2004-2006, Michael Wallner | +--------------------------------------------------------------------+ */ @@ -15,27 +15,49 @@ #ifndef PHP_EXT_HTTP_H #define PHP_EXT_HTTP_H -#define PHP_EXT_HTTP_VERSION "0.19.0" +#define PHP_EXT_HTTP_VERSION "1.0.0-dev" + +#ifdef HAVE_CONFIG_H +# include "config.h" +#else +# ifndef PHP_WIN32 +# include "php_config.h" +# endif +#endif #include "php.h" #include "php_http_std_defs.h" #include "phpstr/phpstr.h" #include "missing.h" +#ifdef HTTP_WANT_SAPI +# if PHP_API_VERSION > 20041225 +# define HTTP_HAVE_SAPI_RTIME +# else +# endif +# include "SAPI.h" +#endif #ifdef HTTP_WANT_NETDB # ifdef PHP_WIN32 +# define HTTP_HAVE_NETDB # include # elif defined(HAVE_NETDB_H) +# define HTTP_HAVE_NETDB # include +# ifdef HAVE_UNISTD_H +# include +# endif # endif #endif #if defined(HTTP_WANT_CURL) && defined(HTTP_HAVE_CURL) # ifdef PHP_WIN32 # include +# define CURL_STATICLIB # endif # include +# define HTTP_CURL_VERSION(x, y, z) (LIBCURL_VERSION_NUM >= (((x)<<16) + ((y)<<8) + (z))) #endif #if defined(HTTP_WANT_MAGIC) && defined(HTTP_HAVE_MAGIC) @@ -67,6 +89,7 @@ ZEND_BEGIN_MODULE_GLOBALS(http) struct _http_globals_log { char *cache; char *redirect; + char *not_found; char *allowed_methods; char *composite; } log; @@ -77,26 +100,30 @@ ZEND_BEGIN_MODULE_GLOBALS(http) char *content_type; char *unquoted_etag; time_t last_modified; - int gzip_encoding; + 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 */ } request; #ifdef ZEND_ENGINE_2 @@ -104,22 +131,25 @@ ZEND_BEGIN_MODULE_GLOBALS(http) #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 -#define getGlobals(G) zend_http_globals *G = HTTP_GLOBALS; + +#define HTTP_HAVE_EXT(EXT) ((defined(HAVE_##EXT) || defined(HAVE_PHP_##EXT)) && (HTTP_SHARED_DEPS || !defined(COMPILE_DL_##EXT))) 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); @@ -139,41 +169,38 @@ 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_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); +#ifdef HAVE_CURL_GETFORMDATA +PHP_FUNCTION(http_request_body_encode); +#endif /* HAVE_CURL_GETFORMDATA */ #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 */ /*