1
0
mirror of https://github.com/php/php-src.git synced 2026-04-27 18:23:26 +02:00
Commit Graph

76504 Commits

Author SHA1 Message Date
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
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
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
Anatol Belski 7943f944c2 Fixed bug #65769 localeconv() broken in TS builds 2014-12-05 11:06:06 +01:00
Julien Pauli 1e40b0aff6 Updated NEWS 2014-12-05 10:11:49 +01:00
Peter Cowburn 557026301f Fixed #68479 - Added escape parameter to SplFileObject::fputcsv 2014-12-05 10:10:10 +01:00
Anatol Belski c65143d571 fix dir separators in test 2014-12-05 07:07:58 +01:00
Ferenc Kovacs 4f9f7c7948 Merge branch 'pull-request/932' into PHP-5.5
* pull-request/932:
  add initial install
  switch to C travis project instead of PHP
  use the generic TRAVIS environment var to check for travis (see http://docs.travis-ci.com/user/ci-environment/)
2014-12-04 11:12:17 +01:00
Tjerk Meesters 2bcf8a6cd9 Fixed #65213 - cannot cast SplFileInfo to boolean 2014-12-04 07:17:33 +08:00
Ferenc Kovacs a8b49bbf18 add initial install 2014-12-04 00:13:38 +01:00
Ferenc Kovacs b0f7a46b21 switch to C travis project instead of PHP 2014-12-04 00:08:04 +01:00
Ferenc Kovacs 43c36bdb73 use the generic TRAVIS environment var to check for travis (see http://docs.travis-ci.com/user/ci-environment/) 2014-12-04 00:07:32 +01:00
Anatol Belski 13aaba40cd updated NEWS 2014-12-03 16:47:38 +01:00
Anatol Belski 65fce7f950 Fixed bug #55541 errors spawn MessageBox, which blocks test automation
With that, also fixed bug #68297 (Application Popup provides too few
information) as a better error message is provided to the event log.

In the second case, the condition for display_startup_error was removed. The
condition was added as a fix for bug #30760 which was preventing the
MessageBox to appear. When display_startup_error=on, the error will be seen
on the console. But when running under a webserver it'll probably get lost,
so we need to log it other way into the event log (would be done automatically
when message box was used, but that would eventually cause issues of blocked
execution).

Generally speaking - any MessageBox or other graphical element is a potential
issue and that was repeatedly reported. Graphical elements shouldn't be used
in the core. Even being a rare one it can cause a bad situation where the
server is blocked. Yet some places have to cleaned up.
2014-12-03 16:33:05 +01:00
Ferenc Kovacs 4d743eee5f Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  make sure that we don't truncate the stack trace and cause false test failures when the test is executed in a directory with long path

Conflicts:
	run-tests.php
2014-12-02 19:18:57 +01:00
Ferenc Kovacs b28c3eb47e make sure that we don't truncate the stack trace and cause false test failures when the test is executed in a directory with long path 2014-12-02 19:17:58 +01:00