Skip to content

Commit 2bad01e

Browse files
committed
Fix bug #62665: add curl.cainfo to php.ini
Conflicts: php.ini-development php.ini-production
1 parent a51b500 commit 2bad01e

File tree

3 files changed

+14
-1
lines changed

3 files changed

+14
-1
lines changed

NEWS

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ PHP NEWS
2424
. Fixed bug #65066 (Cli server not responsive when responding with 422 http
2525
status code). (Adam)
2626

27+
- CURL:
28+
. Fixed bug #62665 (curl.cainfo doesn't appear in php.ini). (Lior Kaplan)
29+
2730
- FPM:
2831
. Fixed bug #63983 (enabling FPM borks compile on FreeBSD).
2932
(chibisuke at web dot de, Felipe)
@@ -55,7 +58,7 @@ PHP NEWS
5558
. Allowed PDO_OCI to compile with Oracle Database 12c client libraries.
5659
(Chris Jones)
5760

58-
-PDO_dblib:
61+
- PDO_dblib:
5962
. Fixed bug #65219 (PDO/dblib not working anymore ("use dbName" not sent)).
6063
(Stanley Sufficool)
6164

php.ini-development

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1856,6 +1856,11 @@ ldap.max_links = -1
18561856
[dba]
18571857
;dba.default_handler=
18581858

1859+
[curl]
1860+
; A default value for the CURLOPT_CAINFO option. This is required to be an
1861+
; absolute path.
1862+
;curl.cainfo =
1863+
18591864
; Local Variables:
18601865
; tab-width: 4
18611866
; End:

php.ini-production

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1856,6 +1856,11 @@ ldap.max_links = -1
18561856
[dba]
18571857
;dba.default_handler=
18581858

1859+
[curl]
1860+
; A default value for the CURLOPT_CAINFO option. This is required to be an
1861+
; absolute path.
1862+
;curl.cainfo =
1863+
18591864
; Local Variables:
18601865
; tab-width: 4
18611866
; End:

0 commit comments

Comments
 (0)