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
f06f4c9254
zip extension version 1.12.4
2014-01-29 14:00:50 +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
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
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
79ab514f0c
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
2014-01-28 15:56:17 +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
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
07f3bac6ca
fix *.dsp files related to bug #50333
2014-01-28 13:09:29 +01: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
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
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
fed80ee605
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix English and improve by Stas. Thanks :)
Update source docs
Revert "Update source docs"
Update source docs
2014-01-26 17:20:21 -08:00
d65ddb633d
Fix English and improve by Stas. Thanks :)
2014-01-26 17:20:13 -08:00
f496aac1f6
Update source docs
2014-01-26 17:20:12 -08:00
76c098395d
Revert "Update source docs"
...
This reverts commit 10d06cd4ff
2014-01-26 17:20:12 -08:00
60bcf84dda
Update source docs
2014-01-26 17:20:12 -08:00
561317898c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
drop precision since trigonometric functions are non-portable
XFAIL multibyte tests until they are fixed (bug 66582)
2014-01-26 15:51:38 -08:00
498d94d137
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
drop precision since trigonometric functions are non-portable
XFAIL multibyte tests until they are fixed (bug 66582)
2014-01-26 15:51:27 -08:00
d5560faaa3
drop precision since trigonometric functions are non-portable
...
See: http://stackoverflow.com/questions/21212326/floating-point-arithmetic-and-reproducibility
2014-01-26 15:51:17 -08:00
f49965b487
XFAIL multibyte tests until they are fixed (bug 66582)
2014-01-26 15:51:17 -08:00
2fac5e5669
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
drop precision since trigonometric functions are non-portable
2014-01-26 15:15:50 -08:00
1dcaa109a1
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
drop precision since trigonometric functions are non-portable
2014-01-26 15:15:38 -08:00
35cb180d9e
drop precision since trigonometric functions are non-portable
...
See: http://stackoverflow.com/questions/21212326/floating-point-arithmetic-and-reproducibility
2014-01-26 15:14:16 -08:00
de62be2682
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
XFAIL multibyte tests until they are fixed (bug 66582)
2014-01-26 15:12:19 -08:00
dfe6628440
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
XFAIL multibyte tests until they are fixed (bug 66582)
2014-01-26 15:12:00 -08:00
cd0bf6fc3a
XFAIL multibyte tests until they are fixed (bug 66582)
2014-01-26 15:11:15 -08:00
c2bb54a246
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix test
2014-01-26 14:31:32 -08:00
3f19697c0c
fix test
2014-01-26 14:31:20 -08:00
e52c332b38
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix test
2014-01-26 14:26:01 -08:00
54c1e28a39
fix test
2014-01-26 14:25:49 -08:00
d78c40d25d
fix test - new flag ZEND_ACC_HAS_TYPE_HINTS
2014-01-26 12:17:09 -08:00
2e65908643
Merge branch 'PHP-5.5' into PHP-5.6
2014-01-26 14:02:44 +01:00
7399386a20
Merge branch 'PHP-5.4' into PHP-5.5
2014-01-26 14:02:37 +01:00
251b914afa
Merge branch '45543-timezone-set' into PHP-5.4
2014-01-26 14:02:19 +01:00
Andrey Hristov