d76a6a3e4d
tests still failing, so xfail for now until fixed
2014-01-29 23:48:44 -08:00
210b444e1d
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug data->fd not set to -1 for open_basedir failure.
2014-01-30 14:17:11 +09:00
53e3023566
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug data->fd not set to -1 for open_basedir failure.
2014-01-30 14:16:47 +09:00
b1c0614ecc
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug data->fd not set to -1 for open_basedir failure.
2014-01-30 14:16:05 +09:00
f5e097d1ed
Fixed bug data->fd not set to -1 for open_basedir failure.
2014-01-30 14:15:29 +09:00
ba8cdc855d
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed build breakage from b4b4d9697f
2014-01-29 17:59:46 -07:00
43432c12f1
Fixed build breakage from b4b4d9697f
2014-01-29 17:57:59 -07:00
c91ad8233b
fix merge error after b4b4d9697f
2014-01-29 22:50:56 +01:00
79e0c273b8
Merge branch 'master' of git.php.net:php-src
...
Conflicts:
ext/openssl/xp_ssl.c
2014-01-29 15:33:52 +02:00
1c7f54d4f7
Merge branch 'PHP-5.6'
...
Conflicts:
NEWS
ext/openssl/xp_ssl.c
2014-01-29 15:32:02 +02:00
253a66c8d5
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
2014-01-29 15:28:47 +02:00
7807d7d0ce
Add new INI for rollbacking connections put back into the pconn pool
...
as well a function get the the statistics in easier way than ob_start()
and parsing phpinfo().
2014-01-29 15:27:43 +02:00
cbb1097770
Merge branch 'PHP-5.6'
...
* PHP-5.6:
zip extension version 1.12.4
2014-01-29 14:01:03 +01:00
f06f4c9254
zip extension version 1.12.4
2014-01-29 14:00:50 +01:00
83c302840e
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed Request #66574 Allow multiple paths in php_ini_scanned_path
2014-01-29 09:57:22 +01:00
0fad6dbef3
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed Request #66574 Allow multiple paths in php_ini_scanned_path
2014-01-29 09:57:04 +01:00
da84f3af75
Fixed Request #66574 Allow multiple paths in php_ini_scanned_path
...
php_ini_scanned_path, from --with-config-file-scan-dir option or
from PHP_INI_SCAN_DIR environment variable allow a single path.
In some case it could be useful to allow multiple.
In the proposed patch, multiple paths are allow, using syntax inspired
from Unix MANPATH (: separated list, empty string for builtin value).
For example, this allow to use:
PHP_INI_SCAN_DIR=/foo/php.d:/bar/php.d php
PHP_INI_SCAN_DIR=:/myproject/php.d php
PHP_INI_SCAN_DIR=/myproject/php.d: php
Real use case: in SCL for dependent collections where each collection
provides a separate tree for extensions, libraries and ini files.
2014-01-29 09:53:22 +01:00
3828b5d83d
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed zend.multibyte tests partially
2014-01-29 15:56:13 +09:00
a6ac64bdbb
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed zend.multibyte tests partially
2014-01-29 15:53:57 +09:00
3182660c04
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed zend.multibyte tests partially
2014-01-29 15:51:47 +09:00
d941ac5b4f
Fixed zend.multibyte tests partially
2014-01-29 15:41:30 +09:00
6edc84fcdf
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Update NEWS/UPGRADING
Verify peers by default in client socket operations
Conflicts:
ext/openssl/xp_ssl.c
2014-01-28 10:36:28 -07:00
7a90254231
Update NEWS/UPGRADING
2014-01-28 10:27:00 -07:00
b4b4d9697f
Verify peers by default in client socket operations
2014-01-28 10:05:56 -07:00
4bc8f94b58
Merge branch 'master' of https://github.com/php/php-src
...
* 'master' of https://github.com/php/php-src :
add text for the new constants
add new consts
2014-01-28 09:53:17 -07:00
fb5c7cda5d
Merge branch 'master' of git.php.net:php-src
2014-01-28 15:58:08 +02:00
3834771b2e
Merge branch 'PHP-5.6'
...
Conflicts:
NEWS
UPGRADING
2014-01-28 15:57:48 +02:00
79ab514f0c
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
2014-01-28 15:56:17 +02:00
d9078c7c8d
Merge branch 'PHP-5.6'
2014-01-28 15:47:50 +02:00
c1141d43e9
Merge branch 'PHP-5.5' into PHP-5.6
2014-01-28 15:38:14 +02:00
6b77c3aaa1
Merge branch 'PHP-5.4' into PHP-5.5
2014-01-28 15:33:16 +02:00
79cbcd9ded
add text for the new constants
2014-01-28 15:32:59 +02:00
a87125c1e8
Merge branch 'PHP-5.4' into PHP-5.5
2014-01-28 15:24:45 +02:00
eafe070f86
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2014-01-28 15:23:54 +02:00
d3faae03ec
add new consts
2014-01-28 15:23:41 +02:00
4b8c098f02
Merge branch 'PHP-5.6'
2014-01-28 13:35:13 +01:00
18c2d45006
Merge branch 'PHP-5.5' into PHP-5.6
2014-01-28 13:34:33 +01:00
e8bf18bd9f
Merge branch 'PHP-5.4' into PHP-5.5
2014-01-28 13:33:44 +01:00
e9b4bca5a0
Fixed arginfo of PDO::__construct() to match the docs and zend_parse_parameters definition.
2014-01-28 13:31:52 +01:00
b1396cc7a5
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix *.dsp files related to bug #50333
2014-01-28 13:10:01 +01:00
07f3bac6ca
fix *.dsp files related to bug #50333
2014-01-28 13:09:29 +01:00
aafce7353e
Merge branch '5.6'
...
* 5.6:
Update NEWS/UPGRADING
Prevent invalid SAN peer verification on null byte prefix attack
2014-01-27 15:00:04 -07:00
fc36908c88
Update NEWS/UPGRADING
2014-01-27 14:58:04 -07:00
68883318aa
Prevent invalid SAN peer verification on null byte prefix attack
2014-01-27 14:51:22 -07:00
9f3a98b124
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Remove obsolete description
2014-01-27 18:58:06 +09:00
a63c095033
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Remove obsolete description
Conflicts:
php.ini-development
php.ini-production
2014-01-27 18:57:45 +09:00
de99fd7301
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Remove obsolete description
2014-01-27 18:55:50 +09:00
4dee63ca1c
Remove obsolete description
2014-01-27 18:41:31 +09:00
473cd4d6a9
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix English and improve by Stas. Thanks :)
Update source docs
Revert "Update source docs"
Update source docs
2014-01-26 17:21:33 -08:00
223a62d69e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix English and improve by Stas. Thanks :)
Update source docs
Revert "Update source docs"
Update source docs
Conflicts:
README.EXTENSIONS
2014-01-26 17:21:14 -08:00
Stanislav Malyshev