Browse Source

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

Conflicts:

	php.ini-development
	php.ini-production
pull/389/merge
Stanislav Malyshev 13 years ago
parent
commit
2bad01e61b
  1. 5
      NEWS
  2. 5
      php.ini-development
  3. 5
      php.ini-production

5
NEWS

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

5
php.ini-development

@ -1856,6 +1856,11 @@ ldap.max_links = -1
[dba] [dba]
;dba.default_handler= ;dba.default_handler=
[curl]
; A default value for the CURLOPT_CAINFO option. This is required to be an
; absolute path.
;curl.cainfo =
; Local Variables: ; Local Variables:
; tab-width: 4 ; tab-width: 4
; End: ; End:

5
php.ini-production

@ -1856,6 +1856,11 @@ ldap.max_links = -1
[dba] [dba]
;dba.default_handler= ;dba.default_handler=
[curl]
; A default value for the CURLOPT_CAINFO option. This is required to be an
; absolute path.
;curl.cainfo =
; Local Variables: ; Local Variables:
; tab-width: 4 ; tab-width: 4
; End: ; End:
Loading…
Cancel
Save