Merge branch 'PHP-5.5'

smalyshev · smalyshev · commit 2c8a4af89215 · 2013-07-14T23:57:16.000-07:00
* PHP-5.5:
  Fix bug #62665: add curl.cainfo to php.ini
diff --git a/php.ini-development b/php.ini-development
@@ -1958,6 +1958,11 @@ ldap.max_links = -1
 ; Useful for internal debugging only.
 ;opcache.protect_memory=0
 
+[curl]
+; A default value for the CURLOPT_CAINFO option. This is required to be an
+; absolute path.
+;curl.cainfo =
+
 ; Local Variables:
 ; tab-width: 4
 ; End:
diff --git a/php.ini-production b/php.ini-production
@@ -1959,6 +1959,11 @@ ldap.max_links = -1
 ; Useful for internal debugging only.
 ;opcache.protect_memory=0
 
+[curl]
+; A default value for the CURLOPT_CAINFO option. This is required to be an
+; absolute path.
+;curl.cainfo =
+
 ; Local Variables:
 ; tab-width: 4
 ; End:
