/*
- +----------------------------------------------------------------------+
- | 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$ */
#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_request_method_api.h"
#ifdef HTTP_HAVE_CURL
# include "php_http_request_api.h"
#ifdef HTTP_HAVE_MHASH
# include <mhash.h>
#endif
+#ifdef HTTP_HAVE_ZLIB
+# include <zlib.h>
+#endif
#include <ctype.h>
#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_redirect, NULL)
PHP_FE(http_throttle, NULL)
PHP_FE(http_send_status, NULL)
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)
+ PHP_FE(http_compress, NULL)
+ PHP_FE(http_uncompress, NULL)
+#endif
+ PHP_FE(http_support, NULL)
+
+ EMPTY_FUNCTION_ENTRY
};
/* }}} */
#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_curl_callback_ctx *), http_request_data_free_context, 0);
- zend_llist_init(&G->request.copies.convs, sizeof(http_curl_conv *), http_request_data_free_conv, 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
}
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;
if (!hash_name) {
ZEND_WRITE("HTTP_ETAG_MD5", lenof("HTTP_ETAG_MD5"));
} else {
- ZEND_WRITE("HTTP_ETAG_MHASH|MHASH_", lenof("HTTP_ETAG_MHASH|MHASH_"));
+ ZEND_WRITE("HTTP_ETAG_MHASH_", lenof("HTTP_ETAG_MHASH_"));
ZEND_WRITE(hash_name, strlen(hash_name));
}
}
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_EX("http.etag_mode", "-2", PHP_INI_ALL, OnUpdateLong, http_etag_mode_displayer, 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()
/* }}} */
-
/* {{{ PHP_MINIT_FUNCTION */
PHP_MINIT_FUNCTION(http)
{
REGISTER_INI_ENTRIES();
- HTTP_LONG_CONSTANT("HTTP_ETAG_MD5", HTTP_ETAG_MD5);
- HTTP_LONG_CONSTANT("HTTP_ETAG_SHA1", HTTP_ETAG_SHA1);
- HTTP_LONG_CONSTANT("HTTP_ETAG_MHASH", HTTP_ETAG_MHASH);
-
+ if ( (SUCCESS != PHP_MINIT_CALL(http_support)) ||
+ (SUCCESS != PHP_MINIT_CALL(http_headers)) ||
+ (SUCCESS != PHP_MINIT_CALL(http_cache)) ||
#ifdef HTTP_HAVE_CURL
- if (CURLE_OK != curl_global_init(CURL_GLOBAL_ALL)) {
+ (SUCCESS != PHP_MINIT_CALL(http_request)) ||
+#endif /* HTTP_HAVE_CURL */
+ (SUCCESS != PHP_MINIT_CALL(http_request_method))) {
return FAILURE;
}
-#endif /* HTTP_HAVE_CURL */
#ifdef ZEND_ENGINE_2
- http_util_object_init();
- http_message_object_init();
+ if ( (SUCCESS != PHP_MINIT_CALL(http_util_object)) ||
+ (SUCCESS != PHP_MINIT_CALL(http_message_object)) ||
# ifndef WONKY
- http_response_object_init();
-# endif
+ (SUCCESS != PHP_MINIT_CALL(http_response_object)) ||
+# endif /* WONKY */
# ifdef HTTP_HAVE_CURL
- http_request_object_init();
- http_requestpool_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_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_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, "Extended HTTP support", "enabled");
+ php_info_print_table_row(2, "Extension Version", HTTP_PEXT_VERSION);
#ifdef HTTP_HAVE_CURL
- php_info_print_table_row(2, "cURL HTTP Requests:", curl_version());
+ php_info_print_table_row(2, "cURL HTTP Requests", curl_version());
+#else
+ php_info_print_table_row(2, "cURL HTTP Requests", "disabled");
+#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
- php_info_print_table_row(2, "cURL HTTP Requests:", "disabled");
+ 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);
+ php_info_print_table_row(2, "mhash ETag Generator", mhash_info);
}
#else
- php_info_print_table_row(2, "mhash ETag Generator:", "disabled");
+ 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_row(2, "magic MIME Guessing", "disabled");
#endif
- php_info_print_table_row(2, "Registered Classes:",
+ php_info_print_table_row(2, "Registered Classes",
#ifndef ZEND_ENGINE_2
"none"
#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, ", ");
}
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");
-
+ 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);
}
projects / m6w6 / ext-http / blobdiff