iliaa Wed Aug 30 17:49:28 2006 UTC
Modified files:
/php-src/ext/curl streams.c
Log:
MFB: Fixed bug #33770 (https:// or ftps:// do not work when
--with-curlwrappers is used and ssl certificate is not verifiable).
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/streams.c?r1=1.20&r2=1.21&diff_format=u
Index: php-src/ext/curl/streams.c
diff -u php-src/ext/curl/streams.c:1.20 php-src/ext/curl/streams.c:1.21
--- php-src/ext/curl/streams.c:1.20 Thu Aug 10 19:02:32 2006
+++ php-src/ext/curl/streams.c Wed Aug 30 17:49:28 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streams.c,v 1.20 2006/08/10 19:02:32 iliaa Exp $ */
+/* $Id: streams.c,v 1.21 2006/08/30 17:49:28 iliaa Exp $ */
/* This file implements cURL based wrappers.
* NOTE: If you are implementing your own streams that are intended to
@@ -301,6 +301,17 @@
/* TODO: read cookies and options from context */
if (context && !strncasecmp(filename, "http", sizeof("http")-1)) {
+ if (SUCCESS == php_stream_context_get_option(context, "http",
"curl_verify_ssl_host", &ctx_opt) && Z_TYPE_PP(ctx_opt) == IS_BOOL &&
Z_LVAL_PP(ctx_opt) == 1) {
+ curl_easy_setopt(curlstream->curl,
CURLOPT_SSL_VERIFYHOST, 1);
+ } else {
+ curl_easy_setopt(curlstream->curl,
CURLOPT_SSL_VERIFYHOST, 0);
+ }
+ if (SUCCESS == php_stream_context_get_option(context, "http",
"curl_verify_ssl_peer", &ctx_opt) && Z_TYPE_PP(ctx_opt) == IS_BOOL &&
Z_LVAL_PP(ctx_opt) == 1) {
+ curl_easy_setopt(curlstream->curl,
CURLOPT_SSL_VERIFYPEER, 1);
+ } else {
+ curl_easy_setopt(curlstream->curl,
CURLOPT_SSL_VERIFYPEER, 0);
+ }
+
/* HTTP(S) */
if (SUCCESS == php_stream_context_get_option(context, "http",
"user_agent", &ctx_opt) && Z_TYPE_PP(ctx_opt) == IS_STRING) {
curl_easy_setopt(curlstream->curl, CURLOPT_USERAGENT,
Z_STRVAL_PP(ctx_opt));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
