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));
}
}
PHP_INI_END()
/* }}} */
-/* {{{ SSL */
-#if defined(ZTS) && defined(HTTP_HAVE_CURL) && defined(HAVE_OPENSSL_CRYPTO_H)
-
-#include <openssl/crypto.h>
-
-static MUTEX_T *http_ssl_mutex = NULL;
-
-static void http_ssl_lock(int mode, int n, const char * file, int line)
-{
- if (mode & CRYPTO_LOCK) {
- tsrm_mutex_lock(http_ssl_mutex[n]);
- } else {
- tsrm_mutex_unlock(http_ssl_mutex[n]);
- }
-}
-static unsigned long http_ssl_id(void)
-{
- return (unsigned long) tsrm_thread_id();
-}
-static inline void http_ssl_init(void)
-{
- int i, c = CRYPTO_num_locks();
- http_ssl_mutex = malloc(c * sizeof(MUTEX_T));
-
- for (i = 0; i < c; ++i) {
- http_ssl_mutex[i] = tsrm_mutex_alloc();
- }
-
- CRYPTO_set_id_callback(http_ssl_id);
- CRYPTO_set_locking_callback(http_ssl_lock);
-}
-static inline void http_ssl_cleanup(void)
-{
- int i, c = CRYPTO_num_locks();
-
- CRYPTO_set_id_callback(NULL);
- CRYPTO_set_locking_callback(NULL);
-
- for (i = 0; i < c; ++i) {
- tsrm_mutex_free(http_ssl_mutex[i]);
- }
-}
-#endif
-/* }}} */
-
/* {{{ 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 != http_cache_global_init()) {
+ return FAILURE;
+ }
+ if (SUCCESS != http_request_method_global_init()) {
+ return FAILURE;
+ }
#ifdef HTTP_HAVE_CURL
- if (CURLE_OK == curl_global_init(CURL_GLOBAL_ALL)) {
-# if defined(ZTS) && defined(HAVE_OPENSSL_CRYPTO_H)
- curl_version_info_data *cvid = curl_version_info(CURLVERSION_NOW);
- if (cvid && (cvid->features & CURL_VERSION_SSL)) {
- http_ssl_init();
- }
-# endif
- } else {
+ if (SUCCESS != http_request_global_init()) {
return FAILURE;
}
#endif /* HTTP_HAVE_CURL */
{
UNREGISTER_INI_ENTRIES();
#ifdef HTTP_HAVE_CURL
- curl_global_cleanup();
-# if defined(ZTS) && defined(HAVE_OPENSSL_CRYPTO_H)
- if (http_ssl_mutex) {
- http_ssl_cleanup();
- }
-# endif
+ http_request_global_cleanup();
#endif
return SUCCESS;
}
/* {{{ PHP_RSHUTDOWN_FUNCTION */
PHP_RSHUTDOWN_FUNCTION(http)
{
+#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL)
+ int i, c = zend_hash_num_elements(&HTTP_G(request).methods.custom);
+
+ for (i = 0; i < c; ++i) {
+ http_request_method_unregister(HTTP_MAX_REQUEST_METHOD + i);
+ }
+#endif
http_globals_free(HTTP_GLOBALS);
return SUCCESS;
}
{
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");
+ php_info_print_table_row(2, "cURL HTTP Requests", "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");
+ php_info_print_table_row(2, "magic MIME Guessing", "libmagic/unknown");
#else
- php_info_print_table_row(2, "magic MIME Guessing:", "disabled");
+ 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;
zval **custom_method;
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