Fix bug #62665: add curl.cainfo to php.ini

Conflicts:

	php.ini-development
	php.ini-production

diff --git a/NEWS b/NEWS
index 2ff16758b9cd1c566b789c0e5d789f76b1cf11b3..52eab40b0ebdc9c4243db4bd257136a370076f7d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -24,6 +24,9 @@ PHP                                                                        NEWS
   . Fixed bug #65066 (Cli server not responsive when responding with 422 http
     status code). (Adam)
     
+- CURL:
+  . Fixed bug #62665 (curl.cainfo doesn't appear in php.ini). (Lior Kaplan)
+
 - FPM:
   . Fixed bug #63983 (enabling FPM borks compile on FreeBSD).
     (chibisuke at web dot de, Felipe)
@@ -55,7 +58,7 @@ PHP                                                                        NEWS
   . Allowed PDO_OCI to compile with Oracle Database 12c client libraries.
     (Chris Jones)
 
--PDO_dblib:
+- PDO_dblib:
   . Fixed bug #65219 (PDO/dblib not working anymore ("use dbName" not sent)). 
     (Stanley Sufficool)
 

diff --git a/php.ini-development b/php.ini-development
index 4ff4192f6f84e39e77d181dff321bb1d877effcd..aee8b4837ab1c18f9356f907ac6e2cdbfa7a5271 100644 (file)
--- a/php.ini-development
+++ b/php.ini-development
@@ -1856,6 +1856,11 @@ ldap.max_links = -1
 [dba]
 ;dba.default_handler=
 
+[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
index 814455bbbbbfeee1a5ff7e17290f3d55a7afd6ca..2df1264adf119f95bf797d7d02018bb9838eb413 100644 (file)
--- a/php.ini-production
+++ b/php.ini-production
@@ -1856,6 +1856,11 @@ ldap.max_links = -1
 [dba]
 ;dba.default_handler=
 
+[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: