/*
- +----------------------------------------------------------------------+
- | 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
-#include "php.h"
+
+#define HTTP_WANT_CURL
+#define HTTP_WANT_ZLIB
+#define HTTP_WANT_MAGIC
+#include "php_http.h"
#include "SAPI.h"
#include "php_ini.h"
#include "ext/standard/info.h"
+#include "zend_extensions.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"
# ifndef WONKY
# include "php_http_exception_object.h"
#endif
-#include "missing.h"
-#include "phpstr/phpstr.h"
-
-#ifdef HTTP_HAVE_CURL
-# ifdef PHP_WIN32
-# include <winsock2.h>
-# endif
-# include <curl/curl.h>
-#endif
-#ifdef HTTP_HAVE_MHASH
-# include <mhash.h>
-#endif
-#ifdef HTTP_HAVE_ZLIB
-# include <zlib.h>
-#endif
-
-#include <ctype.h>
ZEND_DECLARE_MODULE_GLOBALS(http);
HTTP_DECLARE_ARG_PASS_INFO();
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_chunked_decode, 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)
PHP_FE(http_gzdecode, NULL)
PHP_FE(http_deflate, NULL)
PHP_FE(http_inflate, NULL)
- PHP_FE(http_compress, NULL)
- PHP_FE(http_uncompress, NULL)
#endif
PHP_FE(http_support, NULL)
};
/* }}} */
+/* {{{ 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
};
/* }}} */
{
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.copies.strings, sizeof(char *), http_request_data_free_string, 0);
- zend_llist_init(&G->request.copies.slists, sizeof(struct curl_slist *), http_request_data_free_slist, 0);
- zend_llist_init(&G->request.copies.contexts, sizeof(http_request_callback_ctx *), http_request_data_free_context, 0);
- zend_llist_init(&G->request.copies.convs, sizeof(http_request_conv *), http_request_data_free_conv, 0);
-#endif
}
static inline void http_globals_free(zend_http_globals *G)
STR_SET(G->send.content_type, NULL);
STR_SET(G->send.unquoted_etag, NULL);
zend_hash_destroy(&G->request.methods.custom);
-#ifdef HTTP_HAVE_CURL
- zend_llist_clean(&G->request.copies.strings);
- zend_llist_clean(&G->request.copies.slists);
- zend_llist_clean(&G->request.copies.contexts);
- zend_llist_clean(&G->request.copies.convs);
-#endif
}
/* }}} */
return OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC);
}
-PHP_INI_DISP(http_etag_mode_displayer)
-{
- long value;
-
- if (type == ZEND_INI_DISPLAY_ORIG && ini_entry->modified) {
- value = (ini_entry->orig_value) ? atoi(ini_entry->orig_value) : HTTP_ETAG_MD5;
- } else if (ini_entry->value) {
- value = (ini_entry->value[0]) ? atoi(ini_entry->value) : HTTP_ETAG_MD5;
- } else {
- value = HTTP_ETAG_MD5;
- }
-
- switch (value)
- {
- case HTTP_ETAG_CRC32:
- ZEND_WRITE("HTTP_ETAG_CRC32", lenof("HTTP_ETAG_CRC32"));
- break;
-
- case HTTP_ETAG_SHA1:
- ZEND_WRITE("HTTP_ETAG_SHA1", lenof("HTTP_ETAG_SHA1"));
- break;
-
- case HTTP_ETAG_MD5:
-#ifndef HTTP_HAVE_MHASH
- default:
-#endif
- ZEND_WRITE("HTTP_ETAG_MD5", lenof("HTTP_ETAG_MD5"));
- break;
-
-#ifdef HTTP_HAVE_MHASH
- default:
- {
- const char *hash_name = mhash_get_hash_name_static(value);
-
- if (!hash_name) {
- ZEND_WRITE("HTTP_ETAG_MD5", lenof("HTTP_ETAG_MD5"));
- } else {
- ZEND_WRITE("HTTP_ETAG_MHASH_", lenof("HTTP_ETAG_MHASH_"));
- ZEND_WRITE(hash_name, strlen(hash_name));
- }
- }
- break;
-#endif
- }
-}
-
#ifndef ZEND_ENGINE_2
# define OnUpdateLong OnUpdateInt
#endif
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_EX("http.etag_mode", "-2", PHP_INI_ALL, OnUpdateLong, http_etag_mode_displayer, etag.mode)
+ HTTP_PHP_INI_ENTRY("http.force_exit", "1", PHP_INI_ALL, OnUpdateBool, force_exit)
PHP_INI_END()
/* }}} */
if ( (SUCCESS != PHP_MINIT_CALL(http_support)) ||
(SUCCESS != PHP_MINIT_CALL(http_headers)) ||
- (SUCCESS != PHP_MINIT_CALL(http_cache)) ||
#ifdef HTTP_HAVE_CURL
(SUCCESS != PHP_MINIT_CALL(http_request)) ||
#endif /* HTTP_HAVE_CURL */
}
#ifdef ZEND_ENGINE_2
- if ( (SUCCESS != PHP_MINIT_CALL(http_util_object)) ||
+ 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
(SUCCESS != PHP_MINIT_CALL(http_request_object)) ||
- (SUCCESS != PHP_MINIT_CALL(http_requestpool_object)) ||
+ (SUCCESS != PHP_MINIT_CALL(http_requestpool_object))||
# endif /* HTTP_HAVE_CURL */
(SUCCESS != PHP_MINIT_CALL(http_exception_object))) {
return FAILURE;
/* {{{ 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_info_print_table_start();
{
php_info_print_table_row(2, "Extended HTTP support", "enabled");
- php_info_print_table_row(2, "Extension Version", HTTP_PEXT_VERSION);
+ 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
#else
php_info_print_table_row(2, "zlib GZIP Encodings", "disabled");
#endif
-#ifdef HTTP_HAVE_MHASH
- {
- char mhash_info[32];
-
- snprintf(mhash_info, 32, "libmhash/%d", MHASH_API_VERSION);
- php_info_print_table_row(2, "mhash ETag Generator", mhash_info);
- }
-#else
- php_info_print_table_row(2, "mhash ETag Generator", "disabled");
-#endif
#if defined(HTTP_HAVE_MAGIC) && !defined(WONKY)
php_info_print_table_row(2, "magic MIME Guessing", "libmagic/unknown");
#else
}
php_info_print_table_end();
- php_info_print_table_start();
- php_info_print_table_colspan_header(2, "Supported ETag Hash Algorithms");
- {
-
- php_info_print_table_row(2, "PHP", "CRC32, MD5, SHA1");
-#ifdef HTTP_HAVE_MHASH
- {
- phpstr *algos = phpstr_new();
- int i, c = mhash_count();
-
- for (i = 0; i <= c; ++i) {
- const char *hash = mhash_get_hash_name_static(i);
-
- if (hash) {
- phpstr_appendf(algos, "%s, ", hash);
- }
- }
- phpstr_fix(algos);
- php_info_print_table_row(2, "MHASH", PHPSTR_VAL(algos));
- phpstr_free(&algos);
- }
-#else
- php_info_print_table_row(2, "MHASH", "not available");
-#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, ", ");
}
projects / m6w6 / ext-http / blobdiff