/*
- +----------------------------------------------------------------------+
- | 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-2007, Michael Wallner <mike@php.net> |
+ +--------------------------------------------------------------------+
*/
/* $Id$ */
+#define HTTP_WANT_SAPI
+#define HTTP_WANT_CURL
+#define HTTP_WANT_EVENT
+#define HTTP_WANT_ZLIB
+#define HTTP_WANT_MAGIC
+#include "php_http.h"
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#ifdef HTTP_HAVE_CURL
-# ifdef PHP_WIN32
-# include <winsock2.h>
-# endif
-# include <curl/curl.h>
-#endif
-
-#include "php.h"
#include "php_ini.h"
-#include "snprintf.h"
#include "ext/standard/info.h"
-#include "ext/session/php_session.h"
-#include "ext/standard/php_string.h"
-#include "ext/standard/php_smart_str.h"
-
-#include "SAPI.h"
+#include "zend_extensions.h"
-#include "php_http.h"
-#include "php_http_std_defs.h"
#include "php_http_api.h"
-#include "php_http_auth_api.h"
-#include "php_http_curl_api.h"
#include "php_http_cache_api.h"
-#include "php_http_curl_api.h"
-#include "php_http_date_api.h"
-#include "php_http_headers_api.h"
+#include "php_http_cookie_api.h"
+#include "php_http_encoding_api.h"
+#include "php_http_filter_api.h"
#include "php_http_message_api.h"
+#include "php_http_persistent_handle_api.h"
+#include "php_http_request_api.h"
+#include "php_http_request_datashare_api.h"
+#include "php_http_request_method_api.h"
+#include "php_http_request_pool_api.h"
#include "php_http_send_api.h"
#include "php_http_url_api.h"
-#include "phpstr/phpstr.h"
-
-#ifdef HTTP_HAVE_CURL
-/* {{{ ARG_INFO */
-# ifdef ZEND_BEGIN_ARG_INFO
-ZEND_BEGIN_ARG_INFO(http_request_info_ref_3, 0)
- ZEND_ARG_PASS_INFO(0)
- ZEND_ARG_PASS_INFO(0)
- ZEND_ARG_PASS_INFO(1)
-ZEND_END_ARG_INFO();
-
-ZEND_BEGIN_ARG_INFO(http_request_info_ref_4, 0)
- ZEND_ARG_PASS_INFO(0)
- ZEND_ARG_PASS_INFO(0)
- ZEND_ARG_PASS_INFO(0)
- ZEND_ARG_PASS_INFO(1)
-ZEND_END_ARG_INFO();
-# else
-static unsigned char http_request_info_ref_3[] = {3, BYREF_NONE, BYREF_NONE, BYREF_FORCE};
-static unsigned char http_request_info_ref_4[] = {4, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_FORCE};
-# endif
-/* }}} ARG_INFO */
+#include "php_http_deflatestream_object.h"
+#include "php_http_exception_object.h"
+#include "php_http_inflatestream_object.h"
+#include "php_http_message_object.h"
+#include "php_http_querystring_object.h"
+#include "php_http_request_object.h"
+#include "php_http_requestdatashare_object.h"
+#include "php_http_requestpool_object.h"
+#include "php_http_response_object.h"
+#include "php_http_util_object.h"
-#endif /* HTTP_HAVE_CURL */
-
-ZEND_DECLARE_MODULE_GLOBALS(http)
+ZEND_DECLARE_MODULE_GLOBALS(http);
+HTTP_DECLARE_ARG_PASS_INFO();
#ifdef COMPILE_DL_HTTP
ZEND_GET_MODULE(http)
#endif
/* {{{ http_functions[] */
-function_entry http_functions[] = {
- PHP_FE(http_test, NULL)
+zend_function_entry http_functions[] = {
PHP_FE(http_date, NULL)
- PHP_FE(http_absolute_uri, NULL)
- PHP_FE(http_negotiate_language, NULL)
- PHP_FE(http_negotiate_charset, NULL)
+ PHP_FE(http_build_url, http_arg_pass_ref_4)
+ PHP_FE(http_build_str, NULL)
+#ifndef ZEND_ENGINE_2
+ PHP_FALIAS(http_build_query, http_build_str, NULL)
+#endif
+ PHP_FE(http_negotiate_language, http_arg_pass_ref_2)
+ PHP_FE(http_negotiate_charset, http_arg_pass_ref_2)
+ PHP_FE(http_negotiate_content_type, http_arg_pass_ref_2)
PHP_FE(http_redirect, NULL)
+ PHP_FE(http_throttle, NULL)
PHP_FE(http_send_status, NULL)
PHP_FE(http_send_last_modified, NULL)
PHP_FE(http_send_content_type, NULL)
PHP_FE(http_send_file, NULL)
PHP_FE(http_send_stream, NULL)
PHP_FE(http_chunked_decode, NULL)
- PHP_FE(http_split_response, NULL)
+ PHP_FE(http_parse_message, NULL)
PHP_FE(http_parse_headers, NULL)
+ PHP_FE(http_parse_cookie, NULL)
+ PHP_FE(http_build_cookie, NULL)
+ PHP_FE(http_parse_params, NULL)
PHP_FE(http_get_request_headers, NULL)
+ PHP_FE(http_get_request_body, NULL)
+ PHP_FE(http_get_request_body_stream, NULL)
+ PHP_FE(http_match_request_header, NULL)
+ PHP_FE(http_persistent_handles_count, NULL)
+ PHP_FE(http_persistent_handles_clean, NULL)
+ PHP_FE(http_persistent_handles_ident, NULL)
#ifdef HTTP_HAVE_CURL
- PHP_FE(http_get, http_request_info_ref_3)
- PHP_FE(http_head, http_request_info_ref_3)
- PHP_FE(http_post_data, http_request_info_ref_4)
- PHP_FE(http_post_array, http_request_info_ref_4)
+ PHP_FE(http_get, http_arg_pass_ref_3)
+ PHP_FE(http_head, http_arg_pass_ref_3)
+ PHP_FE(http_post_data, http_arg_pass_ref_4)
+ PHP_FE(http_post_fields, http_arg_pass_ref_5)
+ PHP_FE(http_put_data, http_arg_pass_ref_4)
+ PHP_FE(http_put_file, http_arg_pass_ref_4)
+ PHP_FE(http_put_stream, http_arg_pass_ref_4)
+ PHP_FE(http_request, http_arg_pass_ref_5)
+ PHP_FE(http_request_body_encode, NULL)
#endif
- PHP_FE(http_auth_basic, NULL)
- PHP_FE(http_auth_basic_cb, NULL)
-#ifndef ZEND_ENGINE_2
- PHP_FE(http_build_query, NULL)
+ PHP_FE(http_request_method_register, NULL)
+ PHP_FE(http_request_method_unregister, NULL)
+ PHP_FE(http_request_method_exists, NULL)
+ PHP_FE(http_request_method_name, NULL)
+ PHP_FE(ob_etaghandler, NULL)
+#ifdef HTTP_HAVE_ZLIB
+ PHP_FE(http_deflate, NULL)
+ PHP_FE(http_inflate, NULL)
+ PHP_FE(ob_deflatehandler, NULL)
+ PHP_FE(ob_inflatehandler, NULL)
#endif
- PHP_FE(ob_httpetaghandler, NULL)
- {NULL, NULL, NULL}
+ PHP_FE(http_support, NULL)
+
+ EMPTY_FUNCTION_ENTRY
};
/* }}} */
-
-#ifdef ZEND_ENGINE_2
-
-/* {{{ HttpUtil */
-
-zend_class_entry *http_util_ce;
-
-#define HTTP_UTIL_ME(me, al, ai) ZEND_FENTRY(me, ZEND_FN(al), ai, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
-
-zend_function_entry http_util_class_methods[] = {
- HTTP_UTIL_ME(date, http_date, NULL)
- HTTP_UTIL_ME(absoluteURI, http_absolute_uri, NULL)
- HTTP_UTIL_ME(negotiateLanguage, http_negotiate_language, NULL)
- HTTP_UTIL_ME(negotiateCharset, http_negotiate_charset, NULL)
- HTTP_UTIL_ME(redirect, http_redirect, NULL)
- HTTP_UTIL_ME(sendStatus, http_send_status, NULL)
- HTTP_UTIL_ME(sendLastModified, http_send_last_modified, NULL)
- HTTP_UTIL_ME(sendContentType, http_send_content_type, NULL)
- HTTP_UTIL_ME(sendContentDisposition, http_send_content_disposition, NULL)
- HTTP_UTIL_ME(matchModified, http_match_modified, NULL)
- HTTP_UTIL_ME(matchEtag, http_match_etag, NULL)
- HTTP_UTIL_ME(cacheLastModified, http_cache_last_modified, NULL)
- HTTP_UTIL_ME(cacheEtag, http_cache_etag, NULL)
- HTTP_UTIL_ME(chunkedDecode, http_chunked_decode, NULL)
- HTTP_UTIL_ME(splitResponse, http_split_response, NULL)
- HTTP_UTIL_ME(parseHeaders, http_parse_headers, NULL)
- HTTP_UTIL_ME(getRequestHeaders, http_get_request_headers, NULL)
-#ifdef HTTP_HAVE_CURL
- HTTP_UTIL_ME(get, http_get, http_request_info_ref_3)
- HTTP_UTIL_ME(head, http_head, http_request_info_ref_3)
- HTTP_UTIL_ME(postData, http_post_data, http_request_info_ref_4)
- HTTP_UTIL_ME(postArray, http_post_array, http_request_info_ref_4)
+PHP_MINIT_FUNCTION(http);
+PHP_MSHUTDOWN_FUNCTION(http);
+PHP_RINIT_FUNCTION(http);
+PHP_RSHUTDOWN_FUNCTION(http);
+PHP_MINFO_FUNCTION(http);
+
+/* {{{ http_module_dep */
+#if ZEND_EXTENSION_API_NO >= 220050617
+static zend_module_dep http_module_deps[] = {
+# ifdef HTTP_HAVE_SPL
+ ZEND_MOD_REQUIRED("spl")
+# endif
+# ifdef HTTP_HAVE_HASH
+ ZEND_MOD_REQUIRED("hash")
+# endif
+# ifdef HTTP_HAVE_SESSION
+ ZEND_MOD_REQUIRED("session")
+# endif
+# ifdef HTTP_HAVE_ICONV
+ ZEND_MOD_REQUIRED("iconv")
+# endif
+# ifdef HTTP_HAVE_EVENT
+ ZEND_MOD_CONFLICTS("event")
#endif
- HTTP_UTIL_ME(authBasic, http_auth_basic, NULL)
- HTTP_UTIL_ME(authBasicCallback, http_auth_basic_cb, NULL)
- {NULL, NULL, NULL}
+ {NULL, NULL, NULL, 0}
};
-/* }}} HttpUtil */
-
-/* {{{ HttpMessage */
-zend_class_entry *http_message_ce;
-static zend_object_handlers http_message_object_handlers;
-
-#define HTTP_MSG_PROPHASH_TYPE 276192743LU
-#define HTTP_MSG_PROPHASH_HTTP_VERSION 1138628683LU
-#define HTTP_MSG_PROPHASH_RAW 2090679983LU
-#define HTTP_MSG_PROPHASH_BODY 254474387LU
-#define HTTP_MSG_PROPHASH_HEADERS 3199929089LU
-#define HTTP_MSG_PROPHASH_NESTED_MESSAGE 3652857165LU
-#define HTTP_MSG_PROPHASH_REQUEST_METHOD 1669022159LU
-#define HTTP_MSG_PROPHASH_REQUEST_URI 3208695486LU
-#define HTTP_MSG_PROPHASH_RESPONSE_STATUS 3857097400LU
-
-#define http_message_object_read_prop _http_message_object_read_prop
-static zval *_http_message_object_read_prop(zval *object, zval *member, int type TSRMLS_DC)
-{
- getObjectEx(http_message_object, obj, object);
- http_message *msg = obj->message;
- zval *return_value;
-
- if (!EG(scope) || !instanceof_function(EG(scope), obj->zo.ce TSRMLS_CC)) {
- zend_error(E_WARNING, "Cannot access protected property %s::$%s", obj->zo.ce->name, Z_STRVAL_P(member));
- return EG(uninitialized_zval_ptr);
- }
-
- ALLOC_ZVAL(return_value);
- return_value->refcount = 0;
-
-#if 0
- fprintf(stderr, "Reading property: %s(%d==%d) (%lu)\n", Z_STRVAL_P(member), Z_STRLEN_P(member), strlen(Z_STRVAL_P(member)),
- zend_get_hash_value(Z_STRVAL_P(member), strlen(Z_STRVAL_P(member)) + 1)
- );
-#endif
-
- switch (zend_get_hash_value(Z_STRVAL_P(member), strlen(Z_STRVAL_P(member)) + 1))
- {
- case HTTP_MSG_PROPHASH_TYPE:
- RETVAL_LONG(msg->type);
- break;
-
- case HTTP_MSG_PROPHASH_HTTP_VERSION:
- switch (msg->type)
- {
- case HTTP_MSG_NONE:
- RETVAL_NULL();
- break;
-
- case HTTP_MSG_REQUEST:
- RETVAL_DOUBLE(msg->info.request.http_version);
- break;
-
- case HTTP_MSG_RESPONSE:
- RETVAL_DOUBLE(msg->info.response.http_version);
- break;
- }
- break;
-
- case HTTP_MSG_PROPHASH_RAW:
- if (msg->raw) {
- if (msg->len) {
- RETVAL_STRINGL(msg->raw, msg->len, 1);
- } else {
- RETVAL_STRINGL(empty_string, 0, 0);
- }
- } else {
- RETVAL_NULL();
- }
- break;
-
- case HTTP_MSG_PROPHASH_BODY:
- phpstr_fix(PHPSTR(msg));
- RETVAL_PHPSTR(PHPSTR(msg), 0, 1);
- break;
-
- case HTTP_MSG_PROPHASH_HEADERS:
- Z_TYPE_P(return_value) = IS_ARRAY;
- Z_ARRVAL_P(return_value) = &msg->hdrs;
- break;
-
- case HTTP_MSG_PROPHASH_NESTED_MESSAGE:
- RETVAL_NULL();
- break;
-
- case HTTP_MSG_PROPHASH_REQUEST_METHOD:
- if (msg->type == HTTP_MSG_REQUEST && msg->info.request.method) {
- RETVAL_STRING(msg->info.request.method, 1);
- } else {
- RETVAL_NULL();
- }
- break;
-
- case HTTP_MSG_PROPHASH_REQUEST_URI:
- if (msg->type == HTTP_MSG_REQUEST && msg->info.request.URI) {
- RETVAL_STRING(msg->info.request.URI, 1);
- } else {
- RETVAL_NULL();
- }
- break;
-
- case HTTP_MSG_PROPHASH_RESPONSE_STATUS:
- if (msg->type == HTTP_MSG_RESPONSE) {
- RETVAL_LONG(msg->info.response.status);
- } else {
- RETVAL_NULL();
- }
- break;
-
- default:
- RETVAL_NULL();
- break;
- }
-
- return return_value;
-}
-
-#define http_message_object_write_prop _http_message_object_write_prop
-static void _http_message_object_write_prop(zval *object, zval *member, zval *value TSRMLS_DC)
-{
- getObjectEx(http_message_object, obj, object);
- http_message *msg = obj->message;
-
- if (!EG(scope) || !instanceof_function(EG(scope), obj->zo.ce TSRMLS_CC)) {
- zend_error(E_WARNING, "Cannot access protected property %s::$%s", obj->zo.ce->name, Z_STRVAL_P(member));
- }
-
-#if 0
- fprintf(stderr, "Writing property: %s(%d==%d) (%lu)\n", Z_STRVAL_P(member), Z_STRLEN_P(member), strlen(Z_STRVAL_P(member)),
- zend_get_hash_value(Z_STRVAL_P(member), strlen(Z_STRVAL_P(member)) + 1)
- );
#endif
-
- switch (zend_get_hash_value(Z_STRVAL_P(member), strlen(Z_STRVAL_P(member)) + 1))
- {
- case HTTP_MSG_PROPHASH_TYPE:
- msg->type = Z_LVAL_P(value);
- break;
-
- case HTTP_MSG_PROPHASH_HTTP_VERSION:
- switch (msg->type)
- {
- case HTTP_MSG_REQUEST:
- msg->info.request.http_version = (float) Z_DVAL_P(value);
- break;
-
- case HTTP_MSG_RESPONSE:
- msg->info.response.http_version = (float) Z_DVAL_P(value);
- break;
- }
- break;
-
- case HTTP_MSG_PROPHASH_RAW:
- http_message_dtor(msg);
- http_message_parse_ex(msg, Z_STRVAL_P(value), Z_STRLEN_P(value), 1);
- break;
-
- case HTTP_MSG_PROPHASH_BODY:
- phpstr_dtor(PHPSTR(msg));
- phpstr_from_string_ex(PHPSTR(msg), Z_STRVAL_P(value), Z_STRLEN_P(value));
- break;
-
- case HTTP_MSG_PROPHASH_HEADERS:
- zend_hash_clean(&msg->hdrs);
- zend_hash_copy(&msg->hdrs, Z_ARRVAL_P(value), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
- break;
-
- case HTTP_MSG_PROPHASH_NESTED_MESSAGE:
- break;
-
- case HTTP_MSG_PROPHASH_REQUEST_METHOD:
- if (msg->type == HTTP_MSG_REQUEST) {
- if (msg->info.request.method) {
- efree(msg->info.request.method);
- }
- msg->info.request.method = estrndup(Z_STRVAL_P(value), Z_STRLEN_P(value));
- }
- break;
-
- case HTTP_MSG_PROPHASH_REQUEST_URI:
- if (msg->type == HTTP_MSG_REQUEST) {
- if (msg->info.request.URI) {
- efree(msg->info.request.URI);
- }
- msg->info.request.URI = estrndup(Z_STRVAL_P(value), Z_STRLEN_P(value));
- }
- break;
-
- case HTTP_MSG_PROPHASH_RESPONSE_STATUS:
- if (msg->type == HTTP_MSG_RESPONSE) {
- msg->info.response.status = Z_LVAL_P(value);
- }
- break;
- }
-}
-
-#define http_message_object_get_props _http_message_object_get_props
-static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC)
-{
- zval *headers;
- getObjectEx(http_message_object, obj, object);
- http_message *msg = obj->message;
-
-#define ASSOC_PROP(obj, ptype, name, val) \
- { \
- zval array; \
- char *m_prop_name; \
- int m_prop_len; \
- Z_ARRVAL(array) = OBJ_PROP(obj); \
- zend_mangle_property_name(&m_prop_name, &m_prop_len, "*", 1, name, lenof(name), 1); \
- add_assoc_ ##ptype## _ex(&array, m_prop_name, sizeof(name)+4, val); \
- }
-#define ASSOC_STRING(obj, name, val) ASSOC_STRINGL(obj, name, val, strlen(val))
-#define ASSOC_STRINGL(obj, name, val, len) \
- { \
- zval array; \
- char *m_prop_name; \
- int m_prop_len; \
- Z_ARRVAL(array) = OBJ_PROP(obj); \
- zend_mangle_property_name(&m_prop_name, &m_prop_len, "*", 1, name, lenof(name), 1); \
- add_assoc_stringl_ex(&array, m_prop_name, sizeof(name)+4, val, len, val != empty_string); \
- }
-
- zend_hash_clean(OBJ_PROP(obj));
-
- ASSOC_PROP(obj, long, "type", msg->type);
- ASSOC_STRINGL(obj, "raw", msg->raw, msg->len)
- ASSOC_STRINGL(obj, "body", PHPSTR_VAL(msg), PHPSTR_LEN(msg));
-
- MAKE_STD_ZVAL(headers);
- array_init(headers);
-
- zend_hash_copy(Z_ARRVAL_P(headers), &msg->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
- ASSOC_PROP(obj, zval, "headers", headers);
-
- switch (msg->type)
- {
- case HTTP_MSG_REQUEST:
- ASSOC_PROP(obj, double, "httpVersion", msg->info.request.http_version);
- ASSOC_PROP(obj, long, "responseStatus", 0);
- ASSOC_STRING(obj, "requestMethod", msg->info.request.method);
- ASSOC_STRING(obj, "requestUri", msg->info.request.URI);
- break;
-
- case HTTP_MSG_RESPONSE:
- ASSOC_PROP(obj, double, "httpVersion", msg->info.response.http_version);
- ASSOC_PROP(obj, long, "responseStatus", msg->info.response.status);
- ASSOC_STRING(obj, "requestMethod", empty_string);
- ASSOC_STRING(obj, "requestUri", empty_string);
- break;
-
- case HTTP_MSG_NONE:
- default:
- ASSOC_PROP(obj, double, "httpVersion", 0.0);
- ASSOC_PROP(obj, long, "responseStatus", 0);
- ASSOC_STRING(obj, "requestMethod", empty_string);
- ASSOC_STRING(obj, "requestUri", empty_string);
- break;
- }
-
- return OBJ_PROP(obj);
-}
-
-#define http_message_global_init() _http_message_global_init(TSRMLS_C)
-static inline void _http_message_global_init(TSRMLS_D)
-{
- http_message_object_handlers.read_property = http_message_object_read_prop;
- http_message_object_handlers.write_property = http_message_object_write_prop;
- http_message_object_handlers.get_properties = http_message_object_get_props;
-}
-
-#define http_message_declare_default_properties(ce) _http_message_declare_default_properties(ce TSRMLS_CC)
-static inline void _http_message_declare_default_properties(zend_class_entry *ce TSRMLS_DC)
-{
- DCL_PROP(PROTECTED, long, type, HTTP_MSG_NONE);
-
- DCL_PROP(PROTECTED, string, raw, "");
- DCL_PROP(PROTECTED, string, body, "");
-
- DCL_PROP(PROTECTED, string, requestMethod, "");
- DCL_PROP(PROTECTED, string, requestUri, "");
- DCL_PROP(PROTECTED, long, responseStatus, 0);
-
- DCL_PROP_N(PROTECTED, httpVersion);
- DCL_PROP_N(PROTECTED, headers);
- DCL_PROP_N(PROTECTED, nestedMessage);
-}
-
-#define http_message_free_object _http_message_free_object
-void _http_message_free_object(zend_object *object TSRMLS_DC)
-{
- http_message_object *o = (http_message_object *) object;
-
- if (OBJ_PROP(o)) {
- zend_hash_destroy(OBJ_PROP(o));
- FREE_HASHTABLE(OBJ_PROP(o));
- }
- if (o->message) {
- http_message_free(o->message);
- }
- efree(o);
-}
-
-#define http_message_new_object _http_message_new_object
-zend_object_value _http_message_new_object(zend_class_entry *ce TSRMLS_DC)
-{
- zend_object_value ov;
- http_message_object *o;
-
- o = ecalloc(1, sizeof(http_message_object));
- o->zo.ce = ce;
- o->message = http_message_new();
-
- ALLOC_HASHTABLE(OBJ_PROP(o));
- zend_hash_init(OBJ_PROP(o), 0, NULL, ZVAL_PTR_DTOR, 0);
-
- ov.handle = zend_objects_store_put(o, (zend_objects_store_dtor_t) zend_objects_destroy_object, http_message_free_object, NULL TSRMLS_CC);
- ov.handlers = &http_message_object_handlers;
-
- return ov;
-}
-
-zend_function_entry http_message_class_methods[] = {
- PHP_ME(HttpMessage, __construct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
- PHP_ME(HttpMessage, __destruct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_DTOR)
- {NULL, NULL, NULL}
-};
-/* }}} */
-
-/* {{{ HttpResponse */
-
-zend_class_entry *http_response_ce;
-static zend_object_handlers http_response_object_handlers;
-
-#define http_response_declare_default_properties(ce) _http_response_declare_default_properties(ce TSRMLS_CC)
-static inline void _http_response_declare_default_properties(zend_class_entry *ce TSRMLS_DC)
-{
- DCL_PROP(PROTECTED, string, contentType, "application/x-octetstream");
- DCL_PROP(PROTECTED, string, eTag, "");
- DCL_PROP(PROTECTED, string, dispoFile, "");
- DCL_PROP(PROTECTED, string, cacheControl, "public");
- DCL_PROP(PROTECTED, string, data, "");
- DCL_PROP(PROTECTED, string, file, "");
- DCL_PROP(PROTECTED, long, stream, 0);
- DCL_PROP(PROTECTED, long, lastModified, 0);
- DCL_PROP(PROTECTED, long, dispoInline, 0);
- DCL_PROP(PROTECTED, long, cache, 0);
- DCL_PROP(PROTECTED, long, gzip, 0);
-
- DCL_PROP(PRIVATE, long, raw_cache_header, 0);
- DCL_PROP(PRIVATE, long, send_mode, -1);
-}
-
-#define http_response_destroy_object _http_response_destroy_object
-void _http_response_destroy_object(void *object, zend_object_handle handle TSRMLS_DC)
-{
- http_response_object *o = object;
- if (OBJ_PROP(o)) {
- zend_hash_destroy(OBJ_PROP(o));
- FREE_HASHTABLE(OBJ_PROP(o));
- }
- efree(o);
-}
-
-#define http_response_new_object _http_response_new_object
-zend_object_value _http_response_new_object(zend_class_entry *ce TSRMLS_DC)
-{
- zend_object_value ov;
- http_response_object *o;
-
- o = ecalloc(1, sizeof(http_response_object));
- o->zo.ce = ce;
-
- ALLOC_HASHTABLE(OBJ_PROP(o));
- zend_hash_init(OBJ_PROP(o), 0, NULL, ZVAL_PTR_DTOR, 0);
- zend_hash_copy(OBJ_PROP(o), &ce->default_properties, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
-
- ov.handle = zend_objects_store_put(o, http_response_destroy_object, NULL, NULL TSRMLS_CC);
- ov.handlers = &http_response_object_handlers;
-
- return ov;
-}
-
-zend_function_entry http_response_class_methods[] = {
- PHP_ME(HttpResponse, __construct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
-/* PHP_ME(HttpResponse, __destruct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_DTOR)
-*/
- PHP_ME(HttpResponse, setETag, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpResponse, getETag, NULL, ZEND_ACC_PUBLIC)
-
- PHP_ME(HttpResponse, setContentDisposition, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpResponse, getContentDisposition, NULL, ZEND_ACC_PUBLIC)
-
- PHP_ME(HttpResponse, setContentType, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpResponse, getContentType, NULL, ZEND_ACC_PUBLIC)
-
- PHP_ME(HttpResponse, setCache, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpResponse, getCache, NULL, ZEND_ACC_PUBLIC)
-
- PHP_ME(HttpResponse, setCacheControl, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpResponse, getCacheControl, NULL, ZEND_ACC_PUBLIC)
-
- PHP_ME(HttpResponse, setGzip, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpResponse, getGzip, NULL, ZEND_ACC_PUBLIC)
-
- PHP_ME(HttpResponse, setData, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpResponse, getData, NULL, ZEND_ACC_PUBLIC)
-
- PHP_ME(HttpResponse, setFile, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpResponse, getFile, NULL, ZEND_ACC_PUBLIC)
-
- PHP_ME(HttpResponse, setStream, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpResponse, getStream, NULL, ZEND_ACC_PUBLIC)
-
- PHP_ME(HttpResponse, send, NULL, ZEND_ACC_PUBLIC)
-
- {NULL, NULL, NULL}
-};
/* }}} */
-/* {{{ HttpRequest */
-#ifdef HTTP_HAVE_CURL
-
-zend_class_entry *http_request_ce;
-static zend_object_handlers http_request_object_handlers;
-
-#define http_request_declare_default_properties(ce) _http_request_declare_default_properties(ce TSRMLS_CC)
-static inline void _http_request_declare_default_properties(zend_class_entry *ce TSRMLS_DC)
-{
- DCL_PROP_N(PROTECTED, options);
- DCL_PROP_N(PROTECTED, responseInfo);
- DCL_PROP_N(PROTECTED, responseData);
- DCL_PROP_N(PROTECTED, postData);
- DCL_PROP_N(PROTECTED, postFiles);
-
- DCL_PROP(PROTECTED, long, method, HTTP_GET);
-
- DCL_PROP(PROTECTED, string, url, "");
- DCL_PROP(PROTECTED, string, contentType, "");
- DCL_PROP(PROTECTED, string, queryData, "");
- DCL_PROP(PROTECTED, string, postData, "");
-}
-
-#define http_request_free_object _http_request_free_object
-void _http_request_free_object(zend_object /* void */ *object TSRMLS_DC)
-{
- http_request_object *o = (http_request_object *) object;
-
- if (OBJ_PROP(o)) {
- zend_hash_destroy(OBJ_PROP(o));
- FREE_HASHTABLE(OBJ_PROP(o));
- }
- if (o->ch) {
- curl_easy_cleanup(o->ch);
- o->ch = NULL;
- }
- efree(o);
-}
-
-#define http_request_new_object _http_request_new_object
-zend_object_value _http_request_new_object(zend_class_entry *ce TSRMLS_DC)
-{
- zend_object_value ov;
- http_request_object *o;
-
- o = ecalloc(1, sizeof(http_request_object));
- o->zo.ce = ce;
- o->ch = curl_easy_init();
-
- ALLOC_HASHTABLE(OBJ_PROP(o));
- zend_hash_init(OBJ_PROP(o), 0, NULL, ZVAL_PTR_DTOR, 0);
- zend_hash_copy(OBJ_PROP(o), &ce->default_properties, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
-
- ov.handle = zend_objects_store_put(o, (zend_objects_store_dtor_t) zend_objects_destroy_object, http_request_free_object, NULL TSRMLS_CC);
- ov.handlers = &http_request_object_handlers;
-
- return ov;
-}
-
-zend_function_entry http_request_class_methods[] = {
- PHP_ME(HttpRequest, __construct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
- PHP_ME(HttpRequest, __destruct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_DTOR)
-
- PHP_ME(HttpRequest, setOptions, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpRequest, getOptions, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpRequest, unsetOptions, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpRequest, setSslOptions, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpRequest, getSslOptions, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpRequest, unsetSslOptions, NULL, ZEND_ACC_PUBLIC)
-
- PHP_ME(HttpRequest, addHeaders, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpRequest, getHeaders, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpRequest, unsetHeaders, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpRequest, addCookies, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpRequest, getCookies, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpRequest, unsetCookies, NULL, ZEND_ACC_PUBLIC)
-
- PHP_ME(HttpRequest, setMethod, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpRequest, getMethod, NULL, ZEND_ACC_PUBLIC)
-
- PHP_ME(HttpRequest, setURL, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpRequest, getURL, NULL, ZEND_ACC_PUBLIC)
-
- PHP_ME(HttpRequest, setContentType, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpRequest, getContentType, NULL, ZEND_ACC_PUBLIC)
-
- PHP_ME(HttpRequest, setQueryData, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpRequest, getQueryData, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpRequest, addQueryData, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpRequest, unsetQueryData, NULL, ZEND_ACC_PUBLIC)
-
- PHP_ME(HttpRequest, setPostData, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpRequest, getPostData, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpRequest, addPostData, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpRequest, unsetPostData, NULL, ZEND_ACC_PUBLIC)
-
- PHP_ME(HttpRequest, addPostFile, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpRequest, getPostFiles, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpRequest, unsetPostFiles, NULL, ZEND_ACC_PUBLIC)
-
- PHP_ME(HttpRequest, send, NULL, ZEND_ACC_PUBLIC)
-
- PHP_ME(HttpRequest, getResponseData, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpRequest, getResponseHeader, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpRequest, getResponseCookie, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpRequest, getResponseCode, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpRequest, getResponseBody, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpRequest, getResponseInfo, NULL, ZEND_ACC_PUBLIC)
-
- {NULL, NULL, NULL}
-};
-
-#endif /* HTTP_HAVE_CURL */
-/* }}} */
-
-#endif /* ZEND_ENGINE_2 */
-
/* {{{ http_module_entry */
zend_module_entry http_module_entry = {
-#if ZEND_MODULE_API_NO >= 20010901
+#if ZEND_EXTENSION_API_NO >= 220050617
+ STANDARD_MODULE_HEADER_EX, NULL,
+ http_module_deps,
+#else
STANDARD_MODULE_HEADER,
#endif
"http",
PHP_RINIT(http),
PHP_RSHUTDOWN(http),
PHP_MINFO(http),
-#if ZEND_MODULE_API_NO >= 20010901
- HTTP_PEXT_VERSION,
-#endif
+ PHP_EXT_HTTP_VERSION,
STANDARD_MODULE_PROPERTIES
};
/* }}} */
+int http_module_number;
-static void free_to_free(void *s)
+/* {{{ http_globals */
+static void http_globals_init_once(zend_http_globals *G)
{
- efree(*(char **)s);
+ memset(G, 0, sizeof(zend_http_globals));
}
-/* {{{ php_http_init_globals(zend_http_globals *) */
-static void php_http_init_globals(zend_http_globals *http_globals)
+#define http_globals_init(g) _http_globals_init((g) TSRMLS_CC)
+static inline void _http_globals_init(zend_http_globals *G TSRMLS_DC)
{
- http_globals->etag_started = 0;
- http_globals->ctype = NULL;
- http_globals->etag = NULL;
- http_globals->lmod = 0;
-#ifdef HTTP_HAVE_CURL
- phpstr_init_ex(&http_globals->curlbuf, HTTP_CURLBUF_SIZE, 0);
-# if LIBCURL_VERSION_NUM < 0x070c00
- memset(&http_globals->curlerr, 0, sizeof(http_globals->curlerr));
-# endif
- zend_llist_init(&http_globals->to_free, sizeof(char *), free_to_free, 0);
+#ifdef HTTP_HAVE_SAPI_RTIME
+ G->request.time = sapi_get_request_time(TSRMLS_C);
+#else
+ G->request.time = time(NULL);
#endif
- http_globals->allowed_methods = NULL;
+ G->send.buffer_size = 0;
+ G->read_post_data = 0;
+}
+
+#define http_globals_free(g) _http_globals_free((g) TSRMLS_CC)
+static inline void _http_globals_free(zend_http_globals *G TSRMLS_DC)
+{
+ if (G->request.headers) {
+ zend_hash_destroy(G->request.headers);
+ FREE_HASHTABLE(G->request.headers);
+ G->request.headers = NULL;
+ }
+ STR_SET(G->send.content_type, NULL);
+ STR_SET(G->send.unquoted_etag, NULL);
+ if (G->server_var) {
+ zval_ptr_dtor(&G->server_var);
+ G->server_var = NULL;
+ }
+}
+
+#if defined(ZTS) && defined(PHP_DEBUG)
+#if ZTS && PHP_DEBUG
+zend_http_globals *http_globals(void)
+{
+ TSRMLS_FETCH();
+ return HTTP_G;
}
+#endif
+#endif
/* }}} */
-/* {{{ static inline STATUS http_check_allowed_methods(char *, int) */
-#define http_check_allowed_methods(m, l) _http_check_allowed_methods((m), (l) TSRMLS_CC)
-static inline void _http_check_allowed_methods(char *methods, int length TSRMLS_DC)
+/* {{{ static inline void http_check_allowed_methods(char *) */
+#define http_check_allowed_methods(m) _http_check_allowed_methods((m) TSRMLS_CC)
+static inline void _http_check_allowed_methods(const char *methods TSRMLS_DC)
{
- if (length && SG(request_info).request_method && (!strstr(methods, SG(request_info).request_method))) {
- char *allow_header = emalloc(length + sizeof("Allow: "));
- sprintf(allow_header, "Allow: %s", methods);
- http_send_header(allow_header);
- efree(allow_header);
- http_send_status(405);
- zend_bailout();
+ if (*methods && SG(request_info).request_method) {
+ if (SUCCESS != http_check_method_ex(SG(request_info).request_method, methods)) {
+ char *header;
+ spprintf(&header, 0, "Allow: %s", methods);
+ http_exit(405, header);
+ }
}
}
/* }}} */
/* {{{ PHP_INI */
-PHP_INI_MH(update_allowed_methods)
+PHP_INI_MH(http_update_allowed_methods)
+{
+ if (*new_value) {
+ http_check_allowed_methods(new_value);
+ }
+ return OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC);
+}
+PHP_INI_MH(http_update_persistent_handle_ident)
{
- http_check_allowed_methods(new_value, new_value_length);
+ HTTP_G->persistent.handles.ident.h = zend_hash_func(new_value, HTTP_G->persistent.handles.ident.l = new_value_length+1);
return OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC);
}
+#ifndef ZEND_ENGINE_2
+# define OnUpdateLong OnUpdateInt
+#endif
+
PHP_INI_BEGIN()
- STD_PHP_INI_ENTRY("http.allowed_methods",
- /* HTTP 1.1 */
- "GET, HEAD, POST, PUT, DELETE, OPTIONS, TRACE, CONNECT, "
- /* WebDAV - RFC 2518 * /
- "PROPFIND, PROPPATCH, MKCOL, COPY, MOVE, LOCK, UNLOCK, "
- /* WebDAV Versioning - RFC 3253 * /
- "VERSION-CONTROL, REPORT, CHECKOUT, CHECKIN, UNCHECKOUT, "
- "MKWORKSPACE, UPDATE, LABEL, MERGE, BASELINE-CONTROL, MKACTIVITY, "
- /* WebDAV Access Control - RFC 3744 * /
- "ACL, "
- /* END */
- ,
- PHP_INI_ALL, update_allowed_methods, allowed_methods, zend_http_globals, http_globals)
+ HTTP_PHP_INI_ENTRY("http.etag.mode", "MD5", PHP_INI_ALL, OnUpdateString, etag.mode)
+ HTTP_PHP_INI_ENTRY("http.log.cache", "", PHP_INI_ALL, OnUpdateString, log.cache)
+ HTTP_PHP_INI_ENTRY("http.log.redirect", "", PHP_INI_ALL, OnUpdateString, log.redirect)
+ HTTP_PHP_INI_ENTRY("http.log.not_found", "", PHP_INI_ALL, OnUpdateString, log.not_found)
+ HTTP_PHP_INI_ENTRY("http.log.allowed_methods", "", PHP_INI_ALL, OnUpdateString, log.allowed_methods)
+ HTTP_PHP_INI_ENTRY("http.log.composite", "", PHP_INI_ALL, OnUpdateString, log.composite)
+ HTTP_PHP_INI_ENTRY("http.request.methods.allowed", "", PHP_INI_ALL, http_update_allowed_methods, request.methods.allowed)
+ HTTP_PHP_INI_ENTRY("http.request.methods.custom", "", PHP_INI_PERDIR|PHP_INI_SYSTEM, OnUpdateString, request.methods.custom)
+#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL)
+ HTTP_PHP_INI_ENTRY("http.request.datashare.cookie", "0", PHP_INI_SYSTEM, OnUpdateBool, request.datashare.cookie)
+ HTTP_PHP_INI_ENTRY("http.request.datashare.dns", "1", PHP_INI_SYSTEM, OnUpdateBool, request.datashare.dns)
+ HTTP_PHP_INI_ENTRY("http.request.datashare.ssl", "0", PHP_INI_SYSTEM, OnUpdateBool, request.datashare.ssl)
+ HTTP_PHP_INI_ENTRY("http.request.datashare.connect", "0", PHP_INI_SYSTEM, OnUpdateBool, request.datashare.connect)
+#endif
+#ifdef HTTP_HAVE_ZLIB
+ HTTP_PHP_INI_ENTRY("http.send.inflate.start_auto", "0", PHP_INI_PERDIR|PHP_INI_SYSTEM, OnUpdateBool, send.inflate.start_auto)
+ HTTP_PHP_INI_ENTRY("http.send.inflate.start_flags", "0", PHP_INI_ALL, OnUpdateLong, send.inflate.start_flags)
+ HTTP_PHP_INI_ENTRY("http.send.deflate.start_auto", "0", PHP_INI_PERDIR|PHP_INI_SYSTEM, OnUpdateBool, send.deflate.start_auto)
+ HTTP_PHP_INI_ENTRY("http.send.deflate.start_flags", "0", PHP_INI_ALL, OnUpdateLong, send.deflate.start_flags)
+#endif
+ HTTP_PHP_INI_ENTRY("http.persistent.handles.limit", "-1", PHP_INI_SYSTEM, OnUpdateLong, persistent.handles.limit)
+ HTTP_PHP_INI_ENTRY("http.persistent.handles.ident", "GLOBAL", PHP_INI_ALL, http_update_persistent_handle_ident, persistent.handles.ident.s)
+ HTTP_PHP_INI_ENTRY("http.send.not_found_404", "1", PHP_INI_ALL, OnUpdateBool, send.not_found_404)
+#ifdef ZEND_ENGINE_2
+ HTTP_PHP_INI_ENTRY("http.only_exceptions", "0", PHP_INI_ALL, OnUpdateBool, only_exceptions)
+#endif
+ HTTP_PHP_INI_ENTRY("http.force_exit", "1", PHP_INI_ALL, OnUpdateBool, force_exit)
PHP_INI_END()
/* }}} */
-/* {{{ HTTP_CURL_USE_ZEND_MM */
-#if defined(HTTP_HAVE_CURL) && defined(HTTP_CURL_USE_ZEND_MM)
-static void http_curl_free(void *p) { efree(p); }
-static char *http_curl_strdup(const char *p) { return estrdup(p); }
-static void *http_curl_malloc(size_t s) { return emalloc(s); }
-static void *http_curl_realloc(void *p, size_t s) { return erealloc(p, s); }
-static void *http_curl_calloc(size_t n, size_t s) { return ecalloc(n, s); }
-#endif /* HTTP_HAVE_CURL && HTTP_CURL_USE_ZEND_MM */
-/* }}} */
-
/* {{{ PHP_MINIT_FUNCTION */
PHP_MINIT_FUNCTION(http)
{
- ZEND_INIT_MODULE_GLOBALS(http, php_http_init_globals, NULL);
+ http_module_number = module_number;
+ ZEND_INIT_MODULE_GLOBALS(http, http_globals_init_once, NULL);
REGISTER_INI_ENTRIES();
-
+
+ if (0
+ || SUCCESS != PHP_MINIT_CALL(http_persistent_handle) /* first */
+ || SUCCESS != PHP_MINIT_CALL(http_cookie)
+#ifdef HTTP_HAVE_ZLIB
+ || SUCCESS != PHP_MINIT_CALL(http_encoding)
+#endif
#ifdef HTTP_HAVE_CURL
-# ifdef HTTP_CURL_USE_ZEND_MM
- if (CURLE_OK != curl_global_init_mem(CURL_GLOBAL_ALL,
- http_curl_malloc,
- http_curl_free,
- http_curl_realloc,
- http_curl_strdup,
- http_curl_calloc)) {
- return FAILURE;
- }
-# endif /* HTTP_CURL_USE_ZEND_MM */
-
-# if LIBCURL_VERSION_NUM >= 0x070a05
- REGISTER_LONG_CONSTANT("HTTP_AUTH_BASIC", CURLAUTH_BASIC, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("HTTP_AUTH_DIGEST", CURLAUTH_DIGEST, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("HTTP_AUTH_NTLM", CURLAUTH_NTLM, CONST_CS | CONST_PERSISTENT);
-# endif /* LIBCURL_VERSION_NUM */
-#endif /* HTTP_HAVE_CURL */
-
+ || SUCCESS != PHP_MINIT_CALL(http_request)
+# ifdef ZEND_ENGINE_2
+# endif
+#endif
+ || SUCCESS != PHP_MINIT_CALL(http_request_method)
+ || SUCCESS != PHP_MINIT_CALL(http_send)
+ || SUCCESS != PHP_MINIT_CALL(http_support)
+ || SUCCESS != PHP_MINIT_CALL(http_url)
+
#ifdef ZEND_ENGINE_2
- HTTP_REGISTER_CLASS(HttpUtil, http_util, NULL, ZEND_ACC_FINAL_CLASS);
- HTTP_REGISTER_CLASS_EX(HttpMessage, http_message, NULL, 0);
- HTTP_REGISTER_CLASS_EX(HttpResponse, http_response, NULL, 0);
+ || SUCCESS != PHP_MINIT_CALL(http_filter)
+ || SUCCESS != PHP_MINIT_CALL(http_exception_object)
+# ifdef HTTP_HAVE_ZLIB
+ || SUCCESS != PHP_MINIT_CALL(http_deflatestream_object)
+ || SUCCESS != PHP_MINIT_CALL(http_inflatestream_object)
+# endif
+ || SUCCESS != PHP_MINIT_CALL(http_message_object)
+ || SUCCESS != PHP_MINIT_CALL(http_querystring_object)
# ifdef HTTP_HAVE_CURL
- HTTP_REGISTER_CLASS_EX(HttpRequest, http_request, NULL, 0);
-
- REGISTER_LONG_CONSTANT("HTTP_GET", HTTP_GET, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("HTTP_HEAD", HTTP_HEAD, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("HTTP_POST", HTTP_POST, CONST_CS | CONST_PERSISTENT);
-# endif /* HTTP_HAVE_CURL */
-
- http_message_global_init();
-
-#endif /* ZEND_ENGINE_2 */
+ || SUCCESS != PHP_MINIT_CALL(http_request_datashare)
+ || SUCCESS != PHP_MINIT_CALL(http_request_pool)
+ || SUCCESS != PHP_MINIT_CALL(http_request_object)
+ || SUCCESS != PHP_MINIT_CALL(http_requestdatashare_object)
+ || SUCCESS != PHP_MINIT_CALL(http_requestpool_object)
+# endif
+# ifndef WONKY
+ || SUCCESS != PHP_MINIT_CALL(http_response_object)
+# endif
+ || SUCCESS != PHP_MINIT_CALL(http_util_object)
+#endif
+ ) {
+ return FAILURE;
+ }
+
return SUCCESS;
}
/* }}} */
PHP_MSHUTDOWN_FUNCTION(http)
{
UNREGISTER_INI_ENTRIES();
+
+ if (0
#ifdef HTTP_HAVE_CURL
- phpstr_dtor(&HTTP_G(curlbuf));
- curl_global_cleanup();
+ || SUCCESS != PHP_MSHUTDOWN_CALL(http_request)
+# ifdef ZEND_ENGINE_2
+ || SUCCESS != PHP_MSHUTDOWN_CALL(http_request_datashare)
+# endif
#endif
+ || SUCCESS != PHP_MSHUTDOWN_CALL(http_persistent_handle) /* last */
+ ) {
+ return FAILURE;
+ }
+
return SUCCESS;
}
/* }}} */
/* {{{ PHP_RINIT_FUNCTION */
PHP_RINIT_FUNCTION(http)
{
- char *allowed_methods = INI_STR("http.allowed_methods");
- http_check_allowed_methods(allowed_methods, strlen(allowed_methods));
+ http_globals_init(HTTP_G);
+
+ if (HTTP_G->request.methods.allowed && *HTTP_G->request.methods.allowed) {
+ http_check_allowed_methods(HTTP_G->request.methods.allowed);
+ }
+
+ if (0
+#ifdef HTTP_HAVE_ZLIB
+ || SUCCESS != PHP_RINIT_CALL(http_encoding)
+#endif
+#ifdef HTTP_HAVE_CURL
+# ifdef ZEND_ENGINE_2
+# ifdef HTTP_HAVE_EVENT
+ || SUCCESS != PHP_RINIT_CALL(http_request_pool)
+# endif
+ || SUCCESS != PHP_RINIT_CALL(http_request_datashare)
+# endif
+#endif
+ || SUCCESS != PHP_RINIT_CALL(http_request_method)
+ ) {
+ return FAILURE;
+ }
+
return SUCCESS;
}
/* }}} */
/* {{{ PHP_RSHUTDOWN_FUNCTION */
PHP_RSHUTDOWN_FUNCTION(http)
{
- HTTP_G(etag_started) = 0;
- HTTP_G(lmod) = 0;
-
- if (HTTP_G(etag)) {
- efree(HTTP_G(etag));
- HTTP_G(etag) = NULL;
- }
-
- if (HTTP_G(ctype)) {
- efree(HTTP_G(ctype));
- HTTP_G(ctype) = NULL;
- }
-
+ STATUS status = SUCCESS;
+
+ if (0
+#ifdef HTTP_HAVE_ZLIB
+ || SUCCESS != PHP_RSHUTDOWN_CALL(http_encoding)
+#endif
#ifdef HTTP_HAVE_CURL
-# if LIBCURL_VERSION_NUM < 0x070c00
- memset(&HTTP_G(curlerr), 0, sizeof(HTTP_G(curlerr)));
+# ifdef ZEND_ENGINE_2
+ || SUCCESS != PHP_RSHUTDOWN_CALL(http_request_datashare)
# endif
- phpstr_dtor(&HTTP_G(curlbuf));
#endif
-
- return SUCCESS;
+ || SUCCESS != PHP_RSHUTDOWN_CALL(http_request_method)
+ ) {
+ status = FAILURE;
+ }
+
+ http_globals_free(HTTP_G);
+ return status;
}
/* }}} */
/* {{{ PHP_MINFO_FUNCTION */
PHP_MINFO_FUNCTION(http)
{
-#ifdef ZEND_ENGINE_2
-# define HTTP_FUNC_AVAIL(CLASS) "procedural, object oriented (class " CLASS ")"
+ php_info_print_table_start();
+ {
+ php_info_print_table_row(2, "HTTP Support", "enabled");
+ php_info_print_table_row(2, "Extension Version", PHP_EXT_HTTP_VERSION);
+ php_info_print_table_row(2, "Registered Classes",
+#ifndef ZEND_ENGINE_2
+ "none"
+#else
+ "HttpUtil, "
+ "HttpMessage, "
+# ifdef HTTP_HAVE_CURL
+ "HttpRequest, "
+ "HttpRequestPool, "
+ "HttpRequestDataShare, "
+# endif
+# ifdef HTTP_HAVE_ZLIB
+ "HttpDeflateStream, "
+ "HttpInflateStream, "
+# endif
+# ifndef WONKY
+ "HttpResponse, "
+# endif
+ "HttpQueryString"
+#endif
+ );
+ php_info_print_table_row(2, "Output Handlers", "ob_deflatehandler, ob_inflatehandler, ob_etaghandler");
+ php_info_print_table_row(2, "Stream Filters",
+#ifndef ZEND_ENGINE_2
+ "none"
#else
-# define HTTP_FUNC_AVAIL(CLASS) "procedural"
+ "http.chunked_decode, http.chunked_encode, http.deflate, http.inflate"
#endif
-
+ );
+ }
+ php_info_print_table_end();
+
+ php_info_print_table_start();
+ php_info_print_table_header(3, "Used Library", "Compiled", "Linked");
+ {
#ifdef HTTP_HAVE_CURL
-# define HTTP_CURL_VERSION curl_version()
-# ifdef ZEND_ENGINE_2
-# define HTTP_CURL_AVAIL(CLASS) "procedural, object oriented (class " CLASS ")"
-# else
-# define HTTP_CURL_AVAIL(CLASS) "procedural"
-# endif
+ curl_version_info_data *cv = curl_version_info(CURLVERSION_NOW);
+ php_info_print_table_row(3, "libcurl", LIBCURL_VERSION, cv->version);
#else
-# define HTTP_CURL_VERSION "libcurl not available"
-# define HTTP_CURL_AVAIL(CLASS) "libcurl not available"
+ php_info_print_table_row(2, "libcurl", "disabled", "disabled");
#endif
-
- char full_version_string[1024] = {0};
- snprintf(full_version_string, 1023, "%s (%s)", HTTP_PEXT_VERSION, HTTP_CURL_VERSION);
-
+#ifdef HTTP_HAVE_EVENT
+ php_info_print_table_row(3, "libevent", HTTP_EVENT_VERSION, event_get_version());
+#else
+ php_info_print_table_row(3, "libevent", "disabled", "disabled");
+#endif
+#ifdef HTTP_HAVE_ZLIB
+ php_info_print_table_row(3, "libz", ZLIB_VERSION, zlibVersion());
+#else
+ php_info_print_table_row(3, "libz", "disabled", "disabled");
+#endif
+#if defined(HTTP_HAVE_MAGIC)
+ php_info_print_table_row(3, "libmagic", "unknown", "unknown");
+#else
+ php_info_print_table_row(3, "libmagic", "disabled", "disabled");
+#endif
+ }
+ php_info_print_table_end();
+
php_info_print_table_start();
- php_info_print_table_row(2, "Extended HTTP support", "enabled");
- php_info_print_table_row(2, "Extension Version:", full_version_string);
+ php_info_print_table_colspan_header(4, "Persistent Handles");
+ php_info_print_table_header(4, "Provider", "Ident", "Used", "Free");
+ {
+ HashTable *ht;
+ HashPosition pos1, pos2;
+ HashKey provider = initHashKey(0), ident = initHashKey(0);
+ zval **val, **sub, **zused, **zfree;
+
+ if ((ht = http_persistent_handle_statall()) && zend_hash_num_elements(ht)) {
+ FOREACH_HASH_KEYVAL(pos1, ht, provider, val) {
+ if (zend_hash_num_elements(Z_ARRVAL_PP(val))) {
+ FOREACH_KEYVAL(pos2, *val, ident, sub) {
+ if ( SUCCESS == zend_hash_find(Z_ARRVAL_PP(sub), ZEND_STRS("used"), (void *) &zused) &&
+ SUCCESS == zend_hash_find(Z_ARRVAL_PP(sub), ZEND_STRS("free"), (void *) &zfree)) {
+ convert_to_string(*zused);
+ convert_to_string(*zfree);
+ php_info_print_table_row(4, provider.str, ident.str, Z_STRVAL_PP(zused), Z_STRVAL_PP(zfree));
+ } else {
+ php_info_print_table_row(4, provider.str, ident.str, "0", "0");
+ }
+ }
+ } else {
+ php_info_print_table_row(4, provider.str, "N/A", "0", "0");
+ }
+ }
+ } else {
+ php_info_print_table_row(4, "N/A", "N/A", "0", "0");
+ }
+ if (ht) {
+ zend_hash_destroy(ht);
+ FREE_HASHTABLE(ht);
+ }
+ }
php_info_print_table_end();
-
+
php_info_print_table_start();
- php_info_print_table_header(2, "Functionality", "Availability");
- php_info_print_table_row(2, "Miscellaneous Utilities:", HTTP_FUNC_AVAIL("HttpUtil"));
- php_info_print_table_row(2, "Extended HTTP Responses:", HTTP_FUNC_AVAIL("HttpResponse"));
- php_info_print_table_row(2, "Extended HTTP Requests:", HTTP_CURL_AVAIL("HttpRequest"));
+ php_info_print_table_colspan_header(2, "Request Methods");
+ {
+ HashPosition pos;
+ phpstr *methods = phpstr_new();
+ char **name;
+
+ FOREACH_HASH_VAL(pos, &HTTP_G->request.methods.registered, name) {
+ if (pos->h) {
+ phpstr_appendf(methods, "%s, ", *name);
+ }
+ }
+ phpstr_fix(methods);
+ php_info_print_table_row(2, "Registered", PHPSTR_VAL(methods));
+ php_info_print_table_row(2, "Allowed", *HTTP_G->request.methods.allowed ? HTTP_G->request.methods.allowed : "(ANY)");
+ phpstr_free(&methods);
+ }
php_info_print_table_end();
-
+
DISPLAY_INI_ENTRIES();
}
/* }}} */