/*
- +----------------------------------------------------------------------+
- | 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$ */
-
#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 <ctype.h>
+#define HTTP_WANT_CURL
+#define HTTP_WANT_ZLIB
+#define HTTP_WANT_MAGIC
+#include "php_http.h"
-#include "php.h"
+#include "SAPI.h"
#include "php_ini.h"
#include "ext/standard/info.h"
+#include "zend_extensions.h"
-#include "SAPI.h"
-
-#include "php_http.h"
-#include "php_http_std_defs.h"
#include "php_http_api.h"
#include "php_http_send_api.h"
+#include "php_http_cache_api.h"
+#include "php_http_headers_api.h"
+#include "php_http_message_api.h"
+#include "php_http_request_method_api.h"
+#ifdef HTTP_HAVE_CURL
+# include "php_http_request_api.h"
+#endif
#ifdef ZEND_ENGINE_2
+# include "php_http_filter_api.h"
# include "php_http_util_object.h"
# include "php_http_message_object.h"
-# include "php_http_response_object.h"
+# ifndef WONKY
+# include "php_http_response_object.h"
+# endif
# ifdef HTTP_HAVE_CURL
# include "php_http_request_object.h"
+# include "php_http_requestpool_object.h"
# endif
# include "php_http_exception_object.h"
#endif
-#include "phpstr/phpstr.h"
-
-#ifdef HTTP_HAVE_CURL
-#ifdef ZEND_ENGINE_2
-static
-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();
-
-static
-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();
-
-static
-ZEND_BEGIN_ARG_INFO(http_request_info_ref_5, 0)
- ZEND_ARG_PASS_INFO(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};
-static unsigned char http_request_info_ref_5[] = {5, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_FORCE};
-#endif /* ZEND_ENGINE_2 */
-#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[] = {
+zend_function_entry http_functions[] = {
PHP_FE(http_test, NULL)
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_uri, NULL)
+ PHP_FALIAS(http_absolute_uri, http_build_uri, NULL)
+ 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_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_get_request_headers, NULL)
+ PHP_FE(http_get_request_body, NULL)
+ PHP_FE(http_match_request_header, 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_fields, http_request_info_ref_5)
- PHP_FE(http_put_file, http_request_info_ref_4)
- PHP_FE(http_put_stream, 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_file, http_arg_pass_ref_4)
+ PHP_FE(http_put_stream, http_arg_pass_ref_4)
+#endif
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)
-#endif
- PHP_FE(http_auth_basic, NULL)
- PHP_FE(http_auth_basic_cb, NULL)
#ifndef ZEND_ENGINE_2
PHP_FE(http_build_query, NULL)
#endif
PHP_FE(ob_etaghandler, NULL)
- {NULL, NULL, NULL}
+#ifdef HTTP_HAVE_ZLIB
+ PHP_FE(http_gzencode, NULL)
+ PHP_FE(http_gzdecode, NULL)
+ PHP_FE(http_deflate, NULL)
+ PHP_FE(http_inflate, NULL)
+#endif
+ PHP_FE(http_support, NULL)
+
+ EMPTY_FUNCTION_ENTRY
};
/* }}} */
+/* {{{ http_module_dep */
+#if ZEND_EXTENSION_API_NO >= 220050617
+static zend_module_dep http_module_dep[] = {
+# ifdef HAVE_SPL
+ ZEND_MOD_REQUIRED("spl")
+# endif
+# ifdef HTTP_HAVE_EXT_HASH
+ ZEND_MOD_REQUIRED("hash")
+# endif
+ {NULL, NULL, NULL, 0}
+};
+#endif
+/* }}} */
+
/* {{{ 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_dep,
+#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
};
/* }}} */
-#ifdef HTTP_HAVE_CURL
-# ifdef 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_CURL_USE_ZEND_MM */
-static void http_curl_freestr(void *s) { efree(*(char **)s); }
-#endif /* HTTP_HAVE_CURL */
+int http_module_number;
/* {{{ http_globals */
-static inline void http_globals_init(zend_http_globals *G)
+static void http_globals_init_once(zend_http_globals *G)
{
memset(G, 0, sizeof(zend_http_globals));
+}
+
+static inline void http_globals_init(zend_http_globals *G)
+{
G->send.buffer_size = HTTP_SENDBUF_SIZE;
zend_hash_init(&G->request.methods.custom, 0, NULL, ZVAL_PTR_DTOR, 0);
-#ifdef HTTP_HAVE_CURL
- zend_llist_init(&G->request.curl.copies, sizeof(char *), http_curl_freestr, 0);
-#endif
}
+
static inline void http_globals_free(zend_http_globals *G)
{
- STR_FREE(G->send.content_type);
- STR_FREE(G->send.unquoted_etag);
+ STR_SET(G->send.content_type, NULL);
+ STR_SET(G->send.unquoted_etag, NULL);
zend_hash_destroy(&G->request.methods.custom);
}
/* }}} */
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()
- HTTP_PHP_INI_ENTRY("http.allowed_methods", NULL, PHP_INI_ALL, http_update_allowed_methods, request.methods.allowed)
- HTTP_PHP_INI_ENTRY("http.cache_log", NULL, PHP_INI_ALL, OnUpdateString, log.cache)
+ HTTP_PHP_INI_ENTRY("http.allowed_methods", "", PHP_INI_ALL, http_update_allowed_methods, request.methods.allowed)
+ HTTP_PHP_INI_ENTRY("http.cache_log", "", PHP_INI_ALL, OnUpdateString, log.cache)
+ HTTP_PHP_INI_ENTRY("http.redirect_log", "", PHP_INI_ALL, OnUpdateString, log.redirect)
+ HTTP_PHP_INI_ENTRY("http.allowed_methods_log", "", PHP_INI_ALL, OnUpdateString, log.allowed_methods)
+ HTTP_PHP_INI_ENTRY("http.composite_log", "", PHP_INI_ALL, OnUpdateString, log.composite)
+ HTTP_PHP_INI_ENTRY("http.etag_mode", "MD5", PHP_INI_ALL, OnUpdateString, etag.mode)
+#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()
/* }}} */
-
/* {{{ PHP_MINIT_FUNCTION */
PHP_MINIT_FUNCTION(http)
{
- ZEND_INIT_MODULE_GLOBALS(http, NULL, NULL);
- REGISTER_INI_ENTRIES();
+ http_module_number = module_number;
+
+ ZEND_INIT_MODULE_GLOBALS(http, http_globals_init_once, NULL)
+ REGISTER_INI_ENTRIES();
+
+ if ( (SUCCESS != PHP_MINIT_CALL(http_support)) ||
+ (SUCCESS != PHP_MINIT_CALL(http_headers)) ||
#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)) {
+ (SUCCESS != PHP_MINIT_CALL(http_request)) ||
+#endif /* HTTP_HAVE_CURL */
+ (SUCCESS != PHP_MINIT_CALL(http_request_method))) {
return FAILURE;
}
-# endif /* HTTP_CURL_USE_ZEND_MM */
-#endif /* HTTP_HAVE_CURL */
#ifdef ZEND_ENGINE_2
- http_util_object_init();
- http_message_object_init();
- http_response_object_init();
+ if ( (SUCCESS != PHP_MINIT_CALL(http_filter)) ||
+ (SUCCESS != PHP_MINIT_CALL(http_util_object)) ||
+ (SUCCESS != PHP_MINIT_CALL(http_message_object)) ||
+# ifndef WONKY
+ (SUCCESS != PHP_MINIT_CALL(http_response_object)) ||
+# endif /* WONKY */
# ifdef HTTP_HAVE_CURL
- http_request_object_init();
+ (SUCCESS != PHP_MINIT_CALL(http_request_object)) ||
+ (SUCCESS != PHP_MINIT_CALL(http_requestpool_object))||
# endif /* HTTP_HAVE_CURL */
- http_exception_object_init();
+ (SUCCESS != PHP_MINIT_CALL(http_exception_object))) {
+ return FAILURE;
+ }
#endif /* ZEND_ENGINE_2 */
return SUCCESS;
{
UNREGISTER_INI_ENTRIES();
#ifdef HTTP_HAVE_CURL
- curl_global_cleanup();
+ return PHP_MSHUTDOWN_CALL(http_request);
#endif
return SUCCESS;
}
/* {{{ PHP_RINIT_FUNCTION */
PHP_RINIT_FUNCTION(http)
{
- char *m;
-
- if (m = INI_STR("http.allowed_methods")) {
- http_check_allowed_methods(m, strlen(m));
+ if (HTTP_G(request).methods.allowed) {
+ http_check_allowed_methods(HTTP_G(request).methods.allowed,
+ strlen(HTTP_G(request).methods.allowed));
}
http_globals_init(HTTP_GLOBALS);
/* {{{ PHP_RSHUTDOWN_FUNCTION */
PHP_RSHUTDOWN_FUNCTION(http)
{
+ STATUS status = SUCCESS;
+
+#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL)
+ status = PHP_RSHUTDOWN_CALL(http_request_method);
+#endif
+
http_globals_free(HTTP_GLOBALS);
- return SUCCESS;
+ return status;
}
/* }}} */
/* {{{ PHP_MINFO_FUNCTION */
PHP_MINFO_FUNCTION(http)
{
-#ifdef ZEND_ENGINE_2
-# define HTTP_FUNC_AVAIL(CLASS) "procedural, object oriented (" CLASS ")"
+ php_info_print_table_start();
+ {
+ php_info_print_table_row(2, "Extended HTTP support", "enabled");
+ php_info_print_table_row(2, "Extension Version", PHP_EXT_HTTP_VERSION);
+#ifdef HTTP_HAVE_CURL
+ php_info_print_table_row(2, "cURL HTTP Requests", curl_version());
#else
-# define HTTP_FUNC_AVAIL(CLASS) "procedural"
+ php_info_print_table_row(2, "cURL HTTP Requests", "disabled");
#endif
-
-#ifdef HTTP_HAVE_CURL
-# define HTTP_CURL_VERSION curl_version()
-# ifdef ZEND_ENGINE_2
-# define HTTP_CURL_AVAIL(CLASS) "procedural, object oriented (" CLASS ")"
-# else
-# define HTTP_CURL_AVAIL(CLASS) "procedural"
-# endif
+#ifdef HTTP_HAVE_ZLIB
+ {
+ char my_zlib_version[64] = {0};
+
+ strlcat(my_zlib_version, "zlib/", 63);
+ strlcat(my_zlib_version, zlibVersion(), 63);
+ php_info_print_table_row(2, "zlib GZIP Encodings", my_zlib_version);
+ }
#else
-# define HTTP_CURL_VERSION "libcurl not available"
-# define HTTP_CURL_AVAIL(CLASS) "libcurl not available"
+ php_info_print_table_row(2, "zlib GZIP Encodings", "disabled");
#endif
-
-#include "php_http_request_api.h"
-
- php_info_print_table_start();
- {
- char full_version_string[1024] = {0};
- snprintf(full_version_string, 1023, "%s (%s)", HTTP_PEXT_VERSION, HTTP_CURL_VERSION);
-
- php_info_print_table_row(2, "Extended HTTP support:", "enabled");
- php_info_print_table_row(2, "Extension Version:", full_version_string);
+#if defined(HTTP_HAVE_MAGIC) && !defined(WONKY)
+ php_info_print_table_row(2, "magic MIME Guessing", "libmagic/unknown");
+#else
+ php_info_print_table_row(2, "magic MIME Guessing", "disabled");
+#endif
+ php_info_print_table_row(2, "Registered Classes",
+#ifndef ZEND_ENGINE_2
+ "none"
+#else
+ "HttpUtil, "
+ "HttpMessage, "
+# ifdef HTTP_HAVE_CURL
+ "HttpRequest, "
+ "HttpRequestPool, "
+# endif
+# ifndef WONKY
+ "HttpResponse"
+# endif
+#endif
+ );
}
php_info_print_table_end();
-
+
php_info_print_table_start();
+ php_info_print_table_colspan_header(2, "Request Methods");
{
unsigned i;
+ HashPosition pos;
zval **custom_method;
phpstr *known_request_methods = phpstr_new();
phpstr *custom_request_methods = phpstr_new();
phpstr_appendl(known_request_methods, http_request_method_name(i));
phpstr_appends(known_request_methods, ", ");
}
- FOREACH_HASH_VAL(&HTTP_G(request).methods.custom, custom_method) {
+ FOREACH_HASH_VAL(pos, &HTTP_G(request).methods.custom, custom_method) {
phpstr_append(custom_request_methods, Z_STRVAL_PP(custom_method), Z_STRLEN_PP(custom_method));
phpstr_appends(custom_request_methods, ", ");
}
phpstr_fix(known_request_methods);
phpstr_fix(custom_request_methods);
- php_info_print_table_row(2, "Known Request Methods:", PHPSTR_VAL(known_request_methods));
- php_info_print_table_row(2, "Custom Request Methods:",
+ php_info_print_table_row(2, "Known", PHPSTR_VAL(known_request_methods));
+ php_info_print_table_row(2, "Custom",
PHPSTR_LEN(custom_request_methods) ? PHPSTR_VAL(custom_request_methods) : "none registered");
-
- phpstr_free(known_request_methods);
- phpstr_free(custom_request_methods);
- }
- 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, HttpMessage"));
- 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_row(2, "Allowed", strlen(HTTP_G(request).methods.allowed) ? HTTP_G(request).methods.allowed : "(ANY)");
+
+ phpstr_free(&known_request_methods);
+ phpstr_free(&custom_request_methods);
}
php_info_print_table_end();
projects / m6w6 / ext-http / blobdiff