Commit Graph

76670 Commits

Author SHA1 Message Date
Stanislav Malyshev
71c970077d Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  FIx bug #68618 (out of bounds read crashes php-cgi)
2014-12-30 01:26:00 -08:00
Stanislav Malyshev
f9ad308669 FIx bug #68618 (out of bounds read crashes php-cgi) 2014-12-30 01:23:05 -08:00
Kalle Sommer Nielsen
fbf3a6bc1a Fixed bug #68676 (Explicit Double Free) 2014-12-29 11:04:23 +01:00
Keyur Govande
aa192f57c9 Fix for failing tests. gcc 4.8.3 would optimize away the assigment. 2014-12-26 20:36:19 +00:00
Xinchen Hui
80260bcfa6 Fixed test 2014-12-25 06:20:52 -05: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
5fc2fede9c Better fix for #68601 for perf
81e9a993f2
2014-12-17 10:59:36 +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
Stanislav Malyshev
8fe4cc6d28 5.4.37 2014-12-16 11:44:41 -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
9c4de388c6 fix perms 2014-12-16 08:37:48 +01: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
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
Jille Timmermans
9beb3763db pcntl_signal_dispatch: Speed up by preventing system calls when unnecessary 2014-12-12 18:16:12 +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
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
fbe9b2c088 Updated NEWS 2014-12-12 14:18:27 +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
redfoxli
7953d830ab follow C89 format 2014-12-10 21:58:57 +08:00
Anatol Belski
c5f7dcd1dc move the test to the right place 2014-12-10 13:19:51 +01:00
Anatol Belski
20d93534d5 Fixed bug #68545 NULL pointer dereference in unserialize.c 2014-12-10 11:43:33 +01:00
Julien Pauli
a67a5dc0ad Updated NEWS 2014-12-10 11:22:28 +01:00
redfoxli
d0a58695d0 fix-bug-68571-to-php5.5 2014-12-09 19:42:55 +08:00
Derick Rethans
4078c35939 Merge branch 'day-of-week-issues' into PHP-5.5 2014-12-08 11:06:41 +00:00
Derick Rethans
5f9a68d3ef Fixed day_of_week function as it could sometimes return negative values internally. 2014-12-08 11:06:12 +00:00
Dmitry Stogov
e6ad29ae96 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed possible read after end of buffer and use after free.
2014-12-08 12:20:01 +03:00
Dmitry Stogov
dd791cd717 Fixed possible read after end of buffer and use after free. 2014-12-08 12:18:27 +03:00
Anatol Belski
5d126245a3 fixed test 2014-12-06 12:31:27 +01:00
Anatol Belski
9016018ccc C89 compat 2014-12-06 12:14:17 +01:00
Anatol Belski
373aa7c81f add include for missing localeconv_r proto 2014-12-06 12:09:35 +01:00
Anatol Belski
1b4d5ad46a Fixed bug #65230 setting locale randomly broken 2014-12-06 11:59:43 +01:00
Matteo Beccati
625b929c6e Fix compilation error (ref #68424) 2014-12-06 10:23:56 +01:00
Adam Harvey
79131b4617 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Revert unintentional docblock change
2014-12-05 13:57:46 -08:00
Chris Christoff
0e985d3726 Revert unintentional docblock change
Revert unintentional docblock change

It looks like commit dd8e59da8f
introduced an unintended docbloc change. I have reverted this
change in this commit.
2014-12-05 13:57:03 -08:00
Julien Pauli
3add3491b3 Updated NEWS 2014-12-05 17:05:21 +01:00
pwolanin
4c0bd5e77a Start adding new attribute to control multi statements 2014-12-05 17:03:31 +01:00
Anatol Belski
fccd1eda5f . Fixed bug #68120 Update bundled libsqlite 2014-12-05 15:43:53 +01:00