#include "php_http_api.h"
#include "php_http_send_api.h"
+#include "php_http_cookie_api.h"
#include "php_http_cache_api.h"
#include "php_http_send_api.h"
#include "php_http_message_api.h"
/* {{{ http_module_dep */
#if ZEND_EXTENSION_API_NO >= 220050617
-static zend_module_dep http_module_dep[] = {
+static zend_module_dep http_module_deps[] = {
# ifdef HAVE_SPL
ZEND_MOD_REQUIRED("spl")
# endif
# ifdef HAVE_PHP_SESSION
ZEND_MOD_REQUIRED("session")
# endif
+#ifdef HAVE_ICONV
+ ZEND_MOD_REQUIRED("iconv")
+#endif
{NULL, NULL, NULL, 0}
};
#endif
zend_module_entry http_module_entry = {
#if ZEND_EXTENSION_API_NO >= 220050617
STANDARD_MODULE_HEADER_EX, NULL,
- http_module_dep,
+ http_module_deps,
#else
STANDARD_MODULE_HEADER,
#endif
REGISTER_INI_ENTRIES();
if ( (SUCCESS != PHP_MINIT_CALL(http_support)) ||
+ (SUCCESS != PHP_MINIT_CALL(http_cookie)) ||
(SUCCESS != PHP_MINIT_CALL(http_send)) ||
(SUCCESS != PHP_MINIT_CALL(http_url)) ||
#ifdef HTTP_HAVE_CURL
/* {{{ PHP_RINIT_FUNCTION */
PHP_RINIT_FUNCTION(http)
{
- http_globals_init(HTTP_GLOBALS);
+ http_globals_init(HTTP_G);
- if (HTTP_G(request).methods.allowed) {
- http_check_allowed_methods(HTTP_G(request).methods.allowed,
- strlen(HTTP_G(request).methods.allowed));
+ if (HTTP_G->request.methods.allowed) {
+ http_check_allowed_methods(HTTP_G->request.methods.allowed,
+ strlen(HTTP_G->request.methods.allowed));
}
if ( (SUCCESS != PHP_RINIT_CALL(http_request_method))
status = FAILURE;
}
- http_globals_free(HTTP_GLOBALS);
+ http_globals_free(HTTP_G);
return status;
}
/* }}} */
"HttpInflateStream, "
# endif
# ifndef WONKY
- "HttpResponse"
+ "HttpResponse, "
# endif
+ "HttpQueryString"
#endif
);
php_info_print_table_row(2, "Output Handlers", "ob_deflatehandler, ob_inflatehandler, ob_etaghandler");
php_info_print_table_colspan_header(2, "Request Methods");
{
int i;
- getGlobals(G);
phpstr *custom_request_methods = phpstr_new();
phpstr *known_request_methods = phpstr_from_string(HTTP_KNOWN_METHODS, lenof(HTTP_KNOWN_METHODS));
- http_request_method_entry **ptr = G->request.methods.custom.entries;
+ http_request_method_entry **ptr = HTTP_G->request.methods.custom.entries;
- for (i = 0; i < G->request.methods.custom.count; ++i) {
+ for (i = 0; i < HTTP_G->request.methods.custom.count; ++i) {
if (ptr[i]) {
phpstr_appendf(custom_request_methods, "%s, ", ptr[i]->name);
}
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(G->request.methods.allowed) ? G->request.methods.allowed : "(ANY)");
+ 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);