Stanislav Malyshev
e43270cb2a
fix order
2014-06-08 19:03:50 -07:00
Stanislav Malyshev
1607ff8b9e
add news
2014-06-08 19:03:31 -07:00
Stanislav Malyshev
8f527fbf14
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug 666222
Fix bug 666222
2014-06-08 19:02:24 -07:00
Stanislav Malyshev
8f78c3b9eb
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug 666222
2014-06-08 19:00:42 -07:00
Levi Morrison
f47976dd9b
Fix bug 666222
...
This also adds some smaller, isolated tests related to bug 66622.
2014-06-08 18:59:44 -07:00
Levi Morrison
e030efa4f6
Fix bug 666222
...
This also adds some smaller, isolated tests related to bug 66622.
Conflicts:
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
2014-06-08 18:59:23 -07:00
Stanislav Malyshev
19edbc9720
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed identation on file
Fix align indentation
2014-06-08 15:54:32 -07:00
Stanislav Malyshev
38343856e1
Merge branch 'PHp-5.4' into PHP-5.5
...
* PHp-5.4:
Fixed identation on file
Fix align indentation
2014-06-08 15:53:26 -07:00
Bob Weinand
144077edb8
Fix segfault in tests with lexer
...
There's still a bug in parsing commands
2014-06-09 00:38:06 +02:00
Bob Weinand
7cfe696371
Fix ZTS build
2014-06-09 00:02:10 +02:00
Jefersson Nathan
33926b19d0
Fixed identation on file
2014-06-08 14:30:01 -07:00
Jefersson Nathan
e51eaaf665
Fix align indentation
2014-06-08 14:28:51 -07:00
Stanislav Malyshev
3d9f922c03
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Added support for parsing ssl certificates using GeneralizedTime format.
2014-06-08 14:19:50 -07:00
Stanislav Malyshev
4946dc1ab9
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Added support for parsing ssl certificates using GeneralizedTime format.
2014-06-08 14:19:16 -07:00
Paul Oehler
76a7fd893b
Added support for parsing ssl certificates using GeneralizedTime format.
...
fix bug #65698
fix bug #66636
2014-06-08 14:17:58 -07:00
krakjoe
0490850957
remove phpdbg directory from source tree on travis
2014-06-08 22:16:06 +01:00
Stanislav Malyshev
e35945490f
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Remove superfluous echos.
2014-06-08 13:53:01 -07:00
Stanislav Malyshev
da6abc8db4
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Remove superfluous echos.
2014-06-08 13:50:41 -07:00
Jeff Welch
5fd7c2b01d
Remove superfluous echos.
2014-06-08 13:50:22 -07:00
Bob Weinand
4c79fe6afa
Updated parser & leer to be usable with re2c
...
Fixes some weird temporary compilation errors too
2014-06-08 20:34:30 +00:00
Ferenc Kovacs
1e2a4a67dd
use ./tokenizer_data_gen.sh to for adding T_POW & T_POW_EQUAL
2014-06-08 00:01:01 +02:00
Ferenc Kovacs
016b1f089e
Fix bug #67392 : token_name() does not return name for T_POW and T_POW_EQUAL token
2014-06-07 15:27:54 +02:00
Remi Collet
bcef1beb8f
move NEWS entry in the right place
2014-06-06 17:19:35 +02:00
Nikita Popov
6d1885342c
Fix bug #67392 : dtrace breaks argument unpack
2014-06-06 17:09:49 +02:00
Remi Collet
50b980f547
NEWS
2014-06-06 14:19:21 +02:00
Remi Collet
cc6c7dd8ff
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
NEWS
Fix bug #67390 insecure temporary file use in the configure script
2014-06-06 14:19:05 +02:00
Remi Collet
a53b884c47
NEWS
2014-06-06 14:18:29 +02:00
Remi Collet
38e11dfaee
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS
Fix bug #67390 insecure temporary file use in the configure script
2014-06-06 14:18:17 +02:00
Remi Collet
811f35d0ed
NEWS
2014-06-06 14:17:54 +02:00
Remi Collet
91bcadd85e
Fix bug #67390 insecure temporary file use in the configure script
2014-06-06 14:16:04 +02:00
Remi Collet
6a5d5d1db4
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
drop exec perm on doc files
2014-06-05 17:45:59 +02:00
Remi Collet
e31b51f9a0
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
drop exec perm on doc files
2014-06-05 17:45:41 +02:00
Remi Collet
56c9e22c1f
drop exec perm on doc files
2014-06-05 17:45:22 +02:00
Remi Collet
b16950b5d3
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix test for 5.4/5.5
2014-06-05 17:34:32 +02:00
Remi Collet
67f1a58ac9
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix test for 5.4/5.5
2014-06-05 17:34:09 +02:00
Remi Collet
127651e9ae
fix test for 5.4/5.5
2014-06-05 17:33:40 +02:00
Remi Collet
218df7e058
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
add test for previous fix
2014-06-05 14:00:29 +02:00
Remi Collet
ab848ea400
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
add test for previous fix
2014-06-05 14:00:15 +02:00
Remi Collet
15d8c80ead
add test for previous fix
2014-06-05 14:00:00 +02:00
Remi Collet
ce22c03a72
NEWS
2014-06-05 13:46:55 +02:00
Remi Collet
2b3f4cc29e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
NEWS
Fix regression introduce in fix for bug #67118
2014-06-05 13:46:41 +02:00
Remi Collet
c61c24ad79
NEWS
2014-06-05 13:46:13 +02:00
Remi Collet
9ea9064779
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS
Fix regression introduce in fix for bug #67118
2014-06-05 13:45:57 +02:00
Remi Collet
3f47368738
NEWS
2014-06-05 13:45:25 +02:00
Remi Collet
1fe9f1e4f5
Fix regression introduce in fix for bug #67118
...
The fix was correct but break some code (at least in Horde)
This is a temporary workaround to fix regressioni in 5.4, 5.5 and 5.6
This make php_date_initialize more consistent
- on success return 1 + time initiliazed
- on failure return 0 + time = zero
which is check by DATE_CHECK_INITIALIZED by later method call
Will restore consistency with other date classes in master.
2014-06-05 13:39:46 +02:00
Stanislav Malyshev
3d969932bf
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
update news
update NEWS
fix gcov data with some locales (again)
2014-06-04 01:11:07 -07:00
Stanislav Malyshev
4b4a5bc1d3
update news
2014-06-04 01:10:45 -07:00
Stanislav Malyshev
846e076492
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
update NEWS
2014-06-04 01:10:12 -07:00
Stanislav Malyshev
e06c4f7fe5
update NEWS
2014-06-04 01:09:37 -07:00
Bob Weinand
848df6fcbe
Merge sapi/phpdbg into PHP-5.6
2014-06-04 02:18:39 +02:00
