Andrey Hristov
a886a0cf93
Add support for gb18030/MySQL 5.7
2014-06-18 21:53:34 +03:00
Andrey Hristov
6dd0e8e0fc
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
2014-06-18 18:32:51 +03:00
Andrey Hristov
f201bf2305
Fix another problem with MySQL 5.7
2014-06-18 18:30:37 +03:00
Remi Collet
bf7fed7e41
new test, missing in ea466a3
2014-06-18 15:59:45 +02:00
Andrey Hristov
23f77050eb
Merge branch 'PHP-5.5' into PHP-5.6
2014-06-18 16:42:42 +03:00
Andrey Hristov
21c9a9388f
Suppress test failure with MySQL 5.7
2014-06-18 16:20:14 +03:00
Lior Kaplan
b0b47a2064
Update copyright year to 2014
2014-06-18 00:18:47 +03:00
Lior Kaplan
9f727692b6
Update copyright year to 2014
...
Align with online version at http://www.php.net/license/3_01.txt
2014-06-18 00:16:23 +03:00
Lior Kaplan
1222f51ebd
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Update copyright year to 2014
Update copyright year to 2014
Update copyright year to 2014
Update copyright year to 2014
2014-06-18 00:14:18 +03:00
Lior Kaplan
728c554f93
Update copyright year to 2014
2014-06-18 00:12:33 +03:00
Lior Kaplan
a3bd2d268c
Update copyright year to 2014
...
Align with online version at http://www.php.net/license/3_01.txt
2014-06-18 00:11:55 +03:00
Lior Kaplan
d2bdedbcfc
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Update copyright year to 2014
Update copyright year to 2014
2014-06-18 00:11:35 +03:00
Lior Kaplan
4106d48d1c
Update copyright year to 2014
2014-06-17 23:57:20 +03:00
Lior Kaplan
945938d33c
Update copyright year to 2014
2014-06-17 23:56:46 +03:00
Remi Collet
ba34f0c2e8
NEWS
2014-06-17 09:41:10 +02:00
Remi Collet
ea466a316f
Fix Request #67453 Allow to unserialize empty data.
...
SplDoublyLinkedList, SplObjectStorage and ArrayObject have empty
constructor (no arg), so it make sense to allow to unserialize empty
data.
This allow the hack (used in various place, including PHPUnit) to
instanciate class without call to constructor to work.
2014-06-17 09:38:54 +02:00
Lior Kaplan
b538816b0b
Update copyright year to 2014
2014-06-16 23:34:50 +03:00
Lior Kaplan
11b18347d8
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Update copyright year for re2c generated files
Update copyright year to 2014
Update copyright year for re2c files as well
2014-06-16 23:32:10 +03:00
Lior Kaplan
c38b73a701
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Update copyright year for re2c generated files
Update copyright year to 2014
Update copyright year for re2c files as well
2014-06-16 23:30:44 +03:00
Lior Kaplan
6f3bcb0d6e
Update copyright year for re2c generated files
2014-06-16 23:28:36 +03:00
Lior Kaplan
2d576c2a99
Update copyright year to 2014
2014-06-16 23:27:45 +03:00
Lior Kaplan
e667d23178
Update copyright year for re2c files as well
2014-06-16 23:26:50 +03:00
Bob Weinand
3c2b42ac41
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
Zend/zend_compile.c
2014-06-16 11:18:45 +02:00
Bob Weinand
e93f8e74d4
Merge branch 'PHP-5.4' into PHP-5.5
2014-06-16 11:16:33 +02:00
Bob Weinand
0a3979e08b
Fix patch for bug #67436
2014-06-16 11:10:50 +02:00
Remi Collet
6788f14f5e
fix failed test
2014-06-16 10:52:26 +02:00
Remi Collet
fc36277eb6
Fix test on modern distro where old unsecure algo are disabled in openssl config.
...
Testing recent algo should be enough to check this function.
2014-06-16 09:42:55 +02:00
Bob Weinand
7cef3a57ad
Merge branch 'PHP-5.5' into PHP-5.6
2014-06-16 00:42:50 +02:00
Bob Weinand
03ee0ddc5f
Merge branch 'PHP-5.4' into PHP-5.5
2014-06-16 00:41:46 +02:00
Bob Weinand
4053dbe29f
Merge branch 'pull-request/695' into PHP-5.4
2014-06-16 00:35:20 +02:00
Levi Morrison
6c9c44905e
Added tests for bug 67436
2014-06-15 16:31:39 -06:00
Bob Weinand
0913c15092
Merge branch 'PHP-5.5' into PHP-5.6
2014-06-15 23:55:44 +02:00
Bob Weinand
4555779c39
Merge branch 'PHP-5.4' into PHP-5.5
2014-06-15 23:54:05 +02:00
Bob Weinand
a84a2d4ace
Fixed wrong XFAIL test - already fixed
2014-06-15 23:52:41 +02:00
Lior Kaplan
2c327599a3
Fix typo in Bug #67406 NEWS entry
2014-06-16 00:33:09 +03:00
Lior Kaplan
d9432d6a50
Fix typo in Bug #67406 NEWS entry
2014-06-16 00:26:01 +03:00
Bob Weinand
f92143f740
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
NEWS
Zend/zend_compile.c
2014-06-15 23:06:15 +02:00
Bob Weinand
1d802ad5e5
Merge branch 'PHP-5.4' into PHP-5.5
2014-06-15 22:36:13 +02:00
Bob Weinand
85d3ac5763
Updated NEWS
2014-06-15 22:32:47 +02:00
Bob Weinand
f5f1c702cd
Merge branch 'PHP-5.4' into PHP-5.5
2014-06-15 22:24:44 +02:00
Bob Weinand
ca29063da5
Fix bug #67436
2014-06-15 22:18:25 +02:00
Bob Weinand
05d7facb40
Update NEWS
2014-06-15 15:50:36 +02:00
Bob Weinand
f677889a9a
Merge sapi/phpdbg into PHP-5.6
2014-06-15 15:47:14 +02:00
Stanislav Malyshev
da3ef175b9
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
update NEWS
update NEWS
2014-06-15 01:07:48 -07:00
Stanislav Malyshev
b303f19cff
update NEWS
2014-06-15 01:07:39 -07:00
Stanislav Malyshev
b2b3ce717f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
update NEWS
2014-06-15 01:06:46 -07:00
Stanislav Malyshev
55c2721229
update NEWS
2014-06-15 01:06:37 -07:00
Stanislav Malyshev
b053c4f4f6
update NEWS
2014-06-15 00:46:31 -07:00
kovacs.ferenc
e9c2e7d6e6
fix bugsnet #67212 : phpdbg uses non-standard TIOCGWINSZ
2014-06-14 23:48:24 +02:00
kovacs.ferenc
fbb7bdc21e
change the default terminal width from 100 to 80, as that is the most common value
2014-06-14 23:48:24 +02:00