projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
fix clang warning
[m6w6/ext-http]
/
php_http_curl.c
diff --git
a/php_http_curl.c
b/php_http_curl.c
index f6641dcad9811ce42239b8aaa6fddaa645f4fe84..6607ca114a65af1fb26c406fb125823310775897 100644
(file)
--- a/
php_http_curl.c
+++ b/
php_http_curl.c
@@
-6,7
+6,7
@@
| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-201
1
, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-201
3
, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
+--------------------------------------------------------------------+
*/
@@
-88,14
+88,9
@@
static struct gcry_thread_cbs php_http_gnutls_tsl = {
};
#endif
};
#endif
+
PHP_MINIT_FUNCTION(http_curl)
{
PHP_MINIT_FUNCTION(http_curl)
{
- php_http_client_factory_driver_t driver = {
- php_http_curl_client_get_ops(),
- php_http_curl_client_pool_get_ops(),
- php_http_curl_client_datashare_get_ops()
- };
-
#ifdef PHP_HTTP_NEED_OPENSSL_TSL
/* mod_ssl, libpq or ext/curl might already have set thread lock callbacks */
if (!CRYPTO_get_id_callback()) {
#ifdef PHP_HTTP_NEED_OPENSSL_TSL
/* mod_ssl, libpq or ext/curl might already have set thread lock callbacks */
if (!CRYPTO_get_id_callback()) {
@@
-119,10
+114,6
@@
PHP_MINIT_FUNCTION(http_curl)
return FAILURE;
}
return FAILURE;
}
- if (SUCCESS != php_http_client_factory_add_driver(ZEND_STRL("curl"), &driver)) {
- return FAILURE;
- }
-
return SUCCESS;
}
return SUCCESS;
}