Dmitry Stogov
00244baba8
Use better data structures (incomplete)
2014-02-10 12:18:01 +04:00
Dmitry Stogov
f4cfaf36e2
Use better data structures (incomplete)
2014-02-10 10:04:30 +04:00
Remi Collet
5b5b9b9239
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Skip readline tests which fail with libedit Add specific libedit test (output slightly differs)
2014-01-20 09:39:39 +01:00
Remi Collet
0401226d93
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Skip readline tests which fail with libedit Add specific libedit test (output slightly differs)
2014-01-20 09:39:29 +01:00
Remi Collet
e3192473b5
Skip readline tests which fail with libedit
...
Add specific libedit test (output slightly differs)
2014-01-20 09:38:34 +01:00
Remi Collet
3b82a477b0
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed Bug #66412 readline_clear_history() with libedit causes segfault after #65714
2014-01-20 08:41:04 +01:00
Remi Collet
91513097ca
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed Bug #66412 readline_clear_history() with libedit causes segfault after #65714
2014-01-20 08:40:39 +01:00
Remi Collet
31d67bd353
Fixed Bug #66412 readline_clear_history() with libedit causes segfault after #65714
...
Checking all libedit functions, this check is done in each functions (add_history,
read_history, write_history, ...) but is missing in clear_history.
Test coverage: readline_clear_history_001.phpt
2014-01-20 08:38:53 +01:00
Yasuo Ohgaki
fd45f1eb78
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Enable zend.multibyte tests. Tipcal configuration works, but most tests fail.
2014-01-19 13:33:27 +09:00
Yasuo Ohgaki
fb7e25d2e0
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Enable zend.multibyte tests. Tipcal configuration works, but most tests fail.
2014-01-19 13:32:35 +09:00
Yasuo Ohgaki
4e55c6bffb
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Enable zend.multibyte tests. Tipcal configuration works, but most tests fail.
2014-01-19 13:31:50 +09:00
Yasuo Ohgaki
e769c96a11
Enable zend.multibyte tests. Tipcal configuration works, but most tests fail.
2014-01-19 13:29:45 +09:00
Will Fitch
9eb4bc2f84
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix #62479 : Some chars not parsed in passwords
2014-01-18 19:49:06 -05:00
Will Fitch
fb2091b1d4
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix #62479 : Some chars not parsed in passwords
2014-01-18 19:41:45 -05:00
Will Fitch
98907a96f9
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix #62479 : Some chars not parsed in passwords
2014-01-18 19:40:54 -05:00
Will Fitch
da83b513b2
Fix #62479 : Some chars not parsed in passwords
...
This fixes an issue where backslashes and spaces aren't
correctly parsed for passwords.
2014-01-18 19:27:40 -05:00
Will Fitch
4e5195f82c
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix bug #66509 : copy() arginfo incorrect since 5.4
2014-01-18 11:57:34 -05:00
Will Fitch
a540c57331
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #66509 : copy() arginfo incorrect since 5.4
2014-01-18 11:56:22 -05:00
Will Fitch
767e6d2e08
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #66509 : copy() arginfo incorrect since 5.4
Conflicts:
NEWS
2014-01-18 11:39:32 -05:00
Will Fitch
5b906ce6eb
Fix bug #66509 : copy() arginfo incorrect since 5.4
...
Since 5.4, the ZEND_BEGIN_ARG_INFO_EX was replaced
by non _EX, causing Reflection to assume the
$context parameter is required.
2014-01-18 11:25:53 -05:00
Anatol Belski
deb56c010e
Merge branch 'PHP-5.6'
2014-01-17 11:08:21 +01:00
Anatol Belski
b58dbefba0
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
added appropriate exception handling flag to ext\intl
Update NEWS
2014-01-17 11:08:02 +01:00
Anatol Belski
7f0aff52cf
added appropriate exception handling flag to ext\intl
...
According to the doc page
http://msdn.microsoft.com/en-us/library/1deeycx5.aspx
it's appropriate as none of the extern C functions do throw
exceptions. This also fixes the warning C4530.
2014-01-17 11:03:40 +01:00
Anatol Belski
feb4eb850d
Merge branch 'PHP-5.6'
...
* PHP-5.6:
forked the test for bug #66481
2014-01-17 03:32:26 +01:00
Anatol Belski
8b703e9ee0
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
forked the test for bug #66481
2014-01-17 03:32:06 +01:00
Anatol Belski
14e371e7d4
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
forked the test for bug #66481
2014-01-17 03:31:38 +01:00
Anatol Belski
a218a8b917
forked the test for bug #66481
2014-01-17 03:30:42 +01:00
Xinchen Hui
7691926bbe
Merge branch 'PHP-5.6'
2014-01-16 14:42:14 +08:00
Xinchen Hui
bfcdd67865
Merge branch 'PHP-5.5' into PHP-5.6
2014-01-16 14:42:04 +08:00
Xinchen Hui
9799816e0c
Merge branch 'PHP-5.4' into PHP-5.5
2014-01-16 14:41:52 +08:00
Xinchen Hui
b777248ded
Re-fixed Bug #66481 (Calls to session_name() segfault when session.name is null)
2014-01-16 14:41:12 +08:00
Xinchen Hui
271053ad47
Revert "Bug #66481 Segfaults on session_name()"
...
This reverts commit 5662ffb295 .
2014-01-16 14:38:35 +08:00
Yasuo Ohgaki
7b5b2b4efa
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Bug #66481 Segfaults on session_name()
2014-01-16 11:35:57 +09:00
Yasuo Ohgaki
518327f7e3
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Bug #66481 Segfaults on session_name()
2014-01-16 11:35:11 +09:00
Yasuo Ohgaki
744f38c2d6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Bug #66481 Segfaults on session_name()
2014-01-16 11:34:31 +09:00
Conor McDermottroe
5662ffb295
Bug #66481 Segfaults on session_name()
...
If the previous value of session.name was NULL then any call to
session_name($string) would result in a segmentation fault.
This changes the behaviour to set the value of session.name to
"PHPSESSID" if a blank value is given in php.ini or via -d on the
command line. There is already protection against setting it to NULL via
session_name() or ini_set().
2014-01-16 11:33:10 +09:00
Dmitry Stogov
511a375e60
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Log information about cached scripts and keys
2014-01-15 12:15:41 +04:00
Dmitry Stogov
299d893f0a
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Log information about cached scripts and keys
2014-01-15 12:15:25 +04:00
Dmitry Stogov
7359dd6df3
Log information about cached scripts and keys
2014-01-15 12:12:22 +04:00
Dmitry Stogov
61028ad45e
Merge branch 'PHP-5.6'
...
* PHP-5.6:
We don't know PHP_5_6_X_API_NO yet
2014-01-15 11:11:01 +04:00
Dmitry Stogov
77bc5b8bae
We don't know PHP_5_6_X_API_NO yet
2014-01-15 11:09:38 +04:00
Yasuo Ohgaki
e4f1eee6c3
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Added pg_lo_truncate() and 64bit large object support from PostgreSQL 9.3 and up
2014-01-15 14:39:56 +09:00
Yasuo Ohgaki
28be6aea9c
Added pg_lo_truncate() and 64bit large object support from PostgreSQL 9.3 and up
2014-01-15 14:37:24 +09:00
Yasuo Ohgaki
a92c5b14cf
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Always initialize pg_version() result array elements to prevent failed test with older postgresql servers. Add missing client_encoding element.
2014-01-15 14:28:08 +09:00
Yasuo Ohgaki
c58329fccc
Always initialize pg_version() result array elements to prevent failed test with older postgresql servers. Add missing client_encoding element.
2014-01-15 14:27:33 +09:00
Yasuo Ohgaki
ee4e5ce2cf
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed pg_version() crash with older postgresql
2014-01-15 13:32:43 +09:00
Yasuo Ohgaki
d0924c2500
Fixed pg_version() crash with older postgresql
2014-01-15 13:32:15 +09:00
Yasuo Ohgaki
42c134df4b
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed session module is sending multiple set-cookie headers when session.use_strict_mode=1
2014-01-15 11:07:51 +09:00
Yasuo Ohgaki
167eaedcbd
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed session module is sending multiple set-cookie headers when session.use_strict_mode=1
2014-01-15 11:07:10 +09:00
Yasuo Ohgaki
f52c251f60
Fixed session module is sending multiple set-cookie headers when session.use_strict_mode=1
2014-01-15 11:06:06 +09:00