summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS5
-rw-r--r--php.ini-development5
-rw-r--r--php.ini-production5
3 files changed, 14 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 2ff16758b9..52eab40b0e 100644
--- 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 4ff4192f6f..aee8b4837a 100644
--- 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 814455bbbb..2df1264adf 100644
--- 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: