Xinchen Hui
316f72ce28
Merge branch 'PHP-5.5' into PHP-5.6
2014-12-25 06:21:14 -05:00
Xinchen Hui
80260bcfa6
Fixed test
2014-12-25 06:20:52 -05:00
Xinchen Hui
bba4a8aad5
Fixed bug #68644 (strlen incorrect : mbstring + func_overload=2 +UTF-8 + Opcache)
2014-12-24 17:55:58 +08:00
Nikita Popov
87ccf50bad
Merge branch 'PHP-5.5' into PHP-5.6
2014-12-19 21:46:38 +01:00
Nikita Popov
aa394e70ff
Fix bug #67111
...
Loop variables need to be freed for both "break" and "continue".
I'm adding the test to Zend/ because it's good to have a test for
this even without opcache.
2014-12-19 21:42:42 +01:00
Remi Collet
f382fbf4c1
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Better fix for #68601 for perf 81e9a993f2
2014-12-17 11:00:52 +01:00
Remi Collet
5fc2fede9c
Better fix for #68601 for perf
...
81e9a993f2
2014-12-17 10:59:36 +01:00
Ferenc Kovacs
ffae8f1549
move this entry to the correct version
2014-12-17 02:18:29 +01:00
Ferenc Kovacs
54b3871b11
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
add missing NEWS entry
add missing NEWS entry
5.4.37
2014-12-17 02:14:25 +01:00
Ferenc Kovacs
5a67d9a229
add missing NEWS entry
2014-12-17 02:13:59 +01:00
Ferenc Kovacs
925fa271ec
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
add missing NEWS entry
5.4.37
Conflicts:
configure.in
main/php_version.h
2014-12-17 02:13:13 +01:00
Ferenc Kovacs
cd387b4575
add missing NEWS entry
2014-12-17 02:10:36 +01:00
Ferenc Kovacs
c6a7d1eaed
add NEWS entry for #68594
2014-12-17 01:59:38 +01:00
Stanislav Malyshev
8fe4cc6d28
5.4.37
2014-12-16 11:44:41 -08:00
Stanislav Malyshev
681a1afd3f
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
update news
add CVE
add missing test file
Fix bug #68594 - Use after free vulnerability in unserialize()
Conflicts:
ext/standard/var_unserializer.c
2014-12-16 10:19:32 -08:00
Stanislav Malyshev
8efd73c4d2
update news
2014-12-16 10:18:07 -08:00
Stanislav Malyshev
622a346302
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
add CVE
add missing test file
Fix bug #68594 - Use after free vulnerability in unserialize()
2014-12-16 10:17:07 -08:00
Stanislav Malyshev
53f129a44d
add CVE
2014-12-16 10:16:31 -08:00
Stanislav Malyshev
b75867fff0
add missing test file
2014-12-16 10:15:17 -08:00
Stanislav Malyshev
630f9c33c2
Fix bug #68594 - Use after free vulnerability in unserialize()
2014-12-16 10:15:17 -08:00
Remi Collet
181f34f375
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix perms
2014-12-16 08:37:56 +01:00
Remi Collet
9c4de388c6
fix perms
2014-12-16 08:37:48 +01:00
Remi Collet
505adabf25
fix typo
2014-12-14 09:22:59 +01:00
Andrea Faulds
51771ed238
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix undefined behaviour in strnatcmp
update NEWS
move the test to the right place
Fixed bug #68545 NULL pointer dereference in unserialize.c
2014-12-13 22:30:19 +00:00
Andrea Faulds
f804a3614e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix undefined behaviour in strnatcmp
update NEWS
move the test to the right place
Fixed bug #68545 NULL pointer dereference in unserialize.c
Conflicts:
NEWS
2014-12-13 22:28:45 +00:00
Andrea Faulds
034e6decb3
Fix undefined behaviour in strnatcmp
2014-12-13 22:27:10 +00:00
Remi Collet
2e5de0c323
NEWS
2014-12-13 09:05:48 +01:00
Remi Collet
8bd67ce748
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
Fix bug #68601 buffer read overflow in gd_gif_in.c
2014-12-13 09:05:33 +01:00
Remi Collet
ba62b9bbf8
NEWS
2014-12-13 09:04:57 +01:00
Remi Collet
07b5896a13
Fix bug #68601 buffer read overflow in gd_gif_in.c
2014-12-13 09:03:44 +01:00
Julien Pauli
3769aee67c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
pcntl_signal_dispatch: Speed up by preventing system calls when unnecessary
2014-12-12 18:24:16 +01:00
Jille Timmermans
9beb3763db
pcntl_signal_dispatch: Speed up by preventing system calls when unnecessary
2014-12-12 18:16:12 +01:00
Julien Pauli
238529fc3e
Updated NEWS
2014-12-12 16:51:37 +01:00
Julien Pauli
a0d848f795
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Updated NEWS
Fix bug #68532 : convert.base64-encode omits padding bytes
2014-12-12 16:50:42 +01:00
Julien Pauli
d43d0663af
Updated NEWS
2014-12-12 16:50:32 +01:00
mcq8
86f1875536
Fix bug #68532 : convert.base64-encode omits padding bytes
2014-12-12 16:42:38 +01:00
Julien Pauli
4cda98264e
Updated NEWS
2014-12-12 16:12:52 +01:00
Julien Pauli
d5dd29ce5c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Updated NEWS
Fixed Bug #65576 (Constructor from trait conflicts with inherited constructor)
Conflicts:
Zend/zend_compile.c
2014-12-12 16:11:26 +01:00
Julien Pauli
d6eb3b49c8
Updated NEWS
2014-12-12 15:06:04 +01:00
Kévin Dunglas
ee226b961c
Fixed Bug #65576 (Constructor from trait conflicts with inherited constructor)
2014-12-12 14:58:23 +01:00
Julien Pauli
d1a2c15221
Updated NEWS
2014-12-12 14:20:41 +01:00
Julien Pauli
895b4efab0
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Updated NEWS
2014-12-12 14:18:43 +01:00
Julien Pauli
fbe9b2c088
Updated NEWS
2014-12-12 14:18:27 +01:00
Anatol Belski
b1709b8ff0
updated NEWS
2014-12-12 12:17:42 +01:00
Anatol Belski
c96ffaa653
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #68583 Crash in timeout thread
Conflicts:
Zend/zend_execute.h
2014-12-12 12:05:47 +01:00
Anatol Belski
3affc0e8a2
Fixed bug #68583 Crash in timeout thread
...
This replaces the GUI element used for execution timeout handling
on Windows. Instead a timer queue technique is used, which is indeed
a thread pool. A timer queue timer is a lightweight object handled
but that thread pool and the timer thread spends most of the time
sleeping and waiting for an alert.
Please note also that this introduces neither binary nor source
breach. The custom timeout thread functions are deleted, however
they was not exported throug DLL, so couldn't be used by any
external code. As well they couldn't be used anywhere in the core
except in executor api, because those custom timeout thread
functions they used to operate on static variables which would
be overwritten (and that would blow).
So instead a relatively modern technique is used for the timeout
handling. It's still not perfect because the executor still has to
check EX(timed_out). This can be a topic for an improvement in
master. But brobably can be tricky as currently it seems to be not
possible to signal an individual thread. Also note another issue
that static variables aren't thread safe, but the current timer
implementation is.
2014-12-12 10:43:31 +01:00
Stanislav Malyshev
97df260b27
update NEWS
2014-12-11 10:41:17 -08:00
Anatol Belski
0323f66fa2
move the test to the right place
2014-12-11 10:39:47 -08:00
Anatol Belski
13f1c276ab
Fixed bug #68545 NULL pointer dereference in unserialize.c
2014-12-11 10:39:37 -08:00
Anatol Belski
21da246807
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
move the test to the right place
2014-12-10 13:22:52 +01:00
