#include "phpstr/phpstr.h"
#ifdef HTTP_HAVE_CURL
+# if defined(ZTS) && defined(HTTP_HAVE_SSL)
+# if !defined(HAVE_OPENSSL_CRYPTO_H)
+# error "libcurl was compiled with OpenSSL support, but we have no crypto.h"
+# else
+# define HTTP_NEED_SSL
+# include <openssl/crypto.h>
+# endif
+# endif
# ifdef PHP_WIN32
# include <winsock2.h>
# endif
# include <curl/curl.h>
#endif
+#ifdef HTTP_HAVE_MHASH
+# include <mhash.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_build_query, NULL)
#endif
PHP_FE(ob_etaghandler, NULL)
- {NULL, NULL, 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
}
PHP_INI_END()
/* }}} */
+/* {{{ SSL */
+#ifdef HTTP_NEED_SSL
+
+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]);
+ }
+
+ free(http_ssl_mutex);
+ http_ssl_mutex = NULL;
+}
+#endif
+/* }}} */
/* {{{ PHP_MINIT_FUNCTION */
PHP_MINIT_FUNCTION(http)
HTTP_LONG_CONSTANT("HTTP_ETAG_MHASH", HTTP_ETAG_MHASH);
#ifdef HTTP_HAVE_CURL
- if (CURLE_OK != curl_global_init(CURL_GLOBAL_ALL)) {
+ if (CURLE_OK == curl_global_init(CURL_GLOBAL_ALL)) {
+# ifdef HTTP_NEED_SSL
+ curl_version_info_data *cvid = curl_version_info(CURLVERSION_NOW);
+ if (cvid && (cvid->features & CURL_VERSION_SSL)) {
+ http_ssl_init();
+ }
+# endif
+ } else {
return FAILURE;
}
#endif /* HTTP_HAVE_CURL */
UNREGISTER_INI_ENTRIES();
#ifdef HTTP_HAVE_CURL
curl_global_cleanup();
+# ifdef HTTP_NEED_SSL
+ if (http_ssl_mutex) {
+ http_ssl_cleanup();
+ }
+# endif
#endif
return SUCCESS;
}
/* {{{ PHP_MINFO_FUNCTION */
PHP_MINFO_FUNCTION(http)
{
-#ifdef HTTP_HAVE_CURL
-# define HTTP_CURL_VERSION curl_version()
-#else
-# define HTTP_CURL_VERSION "libcurl not available"
-#endif
-
php_info_print_table_start();
{
- char full_version_string[1024] = {0};
- snprintf(full_version_string, 1023, "%s (%s)", HTTP_PEXT_VERSION, HTTP_CURL_VERSION);
-
php_info_print_table_row(2, "Extended HTTP support:", "enabled");
- php_info_print_table_row(2, "Extension Version:", full_version_string);
+ php_info_print_table_row(2, "Extension Version:", HTTP_PEXT_VERSION);
#ifdef HTTP_HAVE_CURL
- php_info_print_table_row(2, "cURL HTTP Requests:", "enabled");
+ 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_MHASH
- php_info_print_table_row(2, "mhash ETag Generator:", "enabled");
+ {
+ 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_row(2, "magic MIME Guessing:", "disabled");
#endif
php_info_print_table_row(2, "Registered Classes:",
#ifndef ZEND_ENGINE_2