#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>
-
#include "php.h"
-#include "php_ini.h"
-#include "ext/standard/info.h"
#include "SAPI.h"
+#include "php_ini.h"
+#include "ext/standard/info.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_request_api.h"
+#ifdef HTTP_HAVE_CURL
+# include "php_http_request_api.h"
+#endif
#ifdef ZEND_ENGINE_2
# include "php_http_util_object.h"
# 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
+
+#include <ctype.h>
+
ZEND_DECLARE_MODULE_GLOBALS(http);
HTTP_DECLARE_ARG_PASS_INFO();
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_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_arg_pass_ref_3)
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);
#endif
}
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
}
/* }}} */
}
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)
+#ifdef ZEND_ENGINE_2
+ HTTP_PHP_INI_ENTRY("http.only_exceptions", "0", PHP_INI_ALL, OnUpdateBool, only_exceptions)
+#endif
PHP_INI_END()
/* }}} */
REGISTER_INI_ENTRIES();
#ifdef HTTP_HAVE_CURL
- if (SUCCESS != http_request_global_init()) {
+ if (CURLE_OK != curl_global_init(CURL_GLOBAL_ALL)) {
return FAILURE;
}
#endif /* HTTP_HAVE_CURL */
http_exception_object_init();
#endif /* ZEND_ENGINE_2 */
+#ifdef ZEND_ENGINE_2
+ zend_hash_init_ex(&http_response_statics, 0, NULL, ZVAL_INTERNAL_PTR_DTOR, 1, 0);
+ zend_fix_static_properties(http_response_object_ce, &http_response_statics TSRMLS_CC);
+#endif
return SUCCESS;
}
/* }}} */
/* {{{ PHP_MSHUTDOWN_FUNCTION */
PHP_MSHUTDOWN_FUNCTION(http)
{
+ zend_hash_destroy(&http_response_statics);
UNREGISTER_INI_ENTRIES();
#ifdef HTTP_HAVE_CURL
curl_global_cleanup();
}
http_globals_init(HTTP_GLOBALS);
+ zend_init_static_properties(http_response_object_ce, &http_response_statics TSRMLS_CC);
return SUCCESS;
}
/* }}} */
/* {{{ PHP_RSHUTDOWN_FUNCTION */
PHP_RSHUTDOWN_FUNCTION(http)
{
+#ifdef ZEND_ENGINE_2
+ zend_clean_static_properties(http_response_object_ce TSRMLS_CC);
+#endif
http_globals_free(HTTP_GLOBALS);
return SUCCESS;
}
}
php_info_print_table_end();
+#ifdef HTTP_HAVE_CURL
php_info_print_table_start();
{
unsigned i;
php_info_print_table_row(2, "Custom Request Methods:",
PHPSTR_LEN(custom_request_methods) ? PHPSTR_VAL(custom_request_methods) : "none registered");
- phpstr_free(known_request_methods);
- phpstr_free(custom_request_methods);
+ phpstr_free(&known_request_methods);
+ phpstr_free(&custom_request_methods);
}
php_info_print_table_end();
+#endif
php_info_print_table_start();
{