granicus.if.org Git

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  5.4.38 next
  Fix bug #68799: Free called on unitialized pointer
  Fix for bug #68710 (Use After Free Vulnerability in PHP's unserialize())

Conflicts:
ext/standard/var_unserializer.c

commit | commitdiff | tree

Stanislav Malyshev [Tue, 20 Jan 2015 18:40:11 +0000 (10:40 -0800)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  5.4.38 next
  Fix bug #68799: Free called on unitialized pointer
  Fix for bug #68710 (Use After Free Vulnerability in PHP's unserialize())

Conflicts:
configure.in
main/php_version.h

commit | commitdiff | tree

Stanislav Malyshev [Tue, 20 Jan 2015 18:38:33 +0000 (10:38 -0800)]

commit | commitdiff | tree

Julien Pauli [Tue, 20 Jan 2015 14:09:59 +0000 (15:09 +0100)]

commit | commitdiff | tree

Julien Pauli [Tue, 20 Jan 2015 14:09:34 +0000 (15:09 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Updated NEWS
Fix bug #68711 Remove useless checks. 'num' is unsigned and cannot be <0.

commit | commitdiff | tree

Julien Pauli [Tue, 20 Jan 2015 14:09:13 +0000 (15:09 +0100)]

commit | commitdiff | tree

Joshua Rogers [Fri, 16 Jan 2015 12:10:54 +0000 (23:10 +1100)]

Fix bug #68711 Remove useless checks. 'num' is unsigned and cannot be <0.

commit | commitdiff | tree

Stanislav Malyshev [Tue, 20 Jan 2015 09:00:52 +0000 (01:00 -0800)]

Merge branch 'bug68710' into PHP-5.4

* bug68710:
Fix for bug #68710 (Use After Free Vulnerability in PHP's unserialize())

commit | commitdiff | tree

Stanislav Malyshev [Tue, 20 Jan 2015 08:57:55 +0000 (00:57 -0800)]

Merge branch 'bug68799' into PHP-5.4

* bug68799:
Fix bug #68799: Free called on unitialized pointer

commit | commitdiff | tree

Derick Rethans [Mon, 19 Jan 2015 22:59:31 +0000 (22:59 +0000)]

Merge branch 'PHP-5.5' into PHP-5.6

commit | commitdiff | tree

Derick Rethans [Mon, 19 Jan 2015 22:59:24 +0000 (22:59 +0000)]

Fixed bug #45081 (strtotime incorrectly interprets SGT time zone).

commit | commitdiff | tree

Juan Basso [Sat, 29 Mar 2014 23:41:48 +0000 (19:41 -0400)]

Fixed bug #50224 where float without decimals were converted to integer

commit | commitdiff | tree

Matteo Beccati [Sun, 18 Jan 2015 08:13:02 +0000 (09:13 +0100)]

Updated NEWS for #68371

commit | commitdiff | tree

Xinchen Hui [Sat, 17 Jan 2015 05:21:36 +0000 (13:21 +0800)]

Merge branch 'PHP-5.5' into PHP-5.6

commit | commitdiff | tree

Xinchen Hui [Sat, 17 Jan 2015 05:21:20 +0000 (13:21 +0800)]

commit | commitdiff | tree

Anatol Belski [Thu, 15 Jan 2015 16:48:59 +0000 (17:48 +0100)]

commit | commitdiff | tree

Anatol Belski [Thu, 15 Jan 2015 16:48:11 +0000 (17:48 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
updated NEWS
PDO_MySQL: Differentiate between linux and win32 when passing unix_socket

commit | commitdiff | tree

Anatol Belski [Thu, 15 Jan 2015 15:42:17 +0000 (16:42 +0100)]

commit | commitdiff | tree

steffen [Mon, 5 Jan 2015 15:50:20 +0000 (16:50 +0100)]

PDO_MySQL: Differentiate between linux and win32 when passing unix_socket

Unix uses "127.0.0.1" as default host for named pipes,
while when using Windows a "." is required as host by mysqlnd.
(This can be seen at mysqlnd.c (line 945 or searching #ifndef PHP_WIN32)

commit | commitdiff | tree

Xinchen Hui [Thu, 15 Jan 2015 15:26:37 +0000 (23:26 +0800)]

commit | commitdiff | tree

Xinchen Hui [Thu, 15 Jan 2015 15:26:24 +0000 (23:26 +0800)]

Merge branch 'PHP-5.5' into PHP-5.6

commit | commitdiff | tree

Xinchen Hui [Thu, 15 Jan 2015 15:09:28 +0000 (23:09 +0800)]

commit | commitdiff | tree

Daniel Lowrey [Wed, 14 Jan 2015 17:09:07 +0000 (18:09 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Update NEWS
Fixed bug #55618 (use case-insensitive cert name matching)

commit | commitdiff | tree

Daniel Lowrey [Wed, 14 Jan 2015 17:04:41 +0000 (18:04 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Update NEWS
Fixed bug #55618 (use case-insensitive cert name matching)

commit | commitdiff | tree

Daniel Lowrey [Wed, 14 Jan 2015 17:03:27 +0000 (18:03 +0100)]

commit | commitdiff | tree

Daniel Lowrey [Wed, 14 Jan 2015 17:02:50 +0000 (18:02 +0100)]

Fixed bug #55618 (use case-insensitive cert name matching)

commit | commitdiff | tree

Xinchen Hui [Tue, 13 Jan 2015 15:38:57 +0000 (23:38 +0800)]

commit | commitdiff | tree

Anatol Belski [Mon, 12 Jan 2015 16:02:18 +0000 (17:02 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed bug #68771 SQL syntax error in sqlite lib

commit | commitdiff | tree

Anatol Belski [Mon, 12 Jan 2015 15:55:47 +0000 (16:55 +0100)]

Fixed bug #68771 SQL syntax error in sqlite lib

commit | commitdiff | tree

Anatol Belski [Mon, 12 Jan 2015 11:59:59 +0000 (12:59 +0100)]

updated libs_versions.txt

commit | commitdiff | tree

Anatol Belski [Mon, 12 Jan 2015 11:58:37 +0000 (12:58 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  updated libs_versions.txt
  Fix bug #68784
  We can't output absolute S and T values for the Diophantine solution here since it can vary based on the libgmp version we are linking against and in general there are almost always multiple valid solutions

commit | commitdiff | tree

Anatol Belski [Mon, 12 Jan 2015 11:58:00 +0000 (12:58 +0100)]

updated libs_versions.txt

commit | commitdiff | tree

Stanislav Malyshev [Sun, 11 Jan 2015 08:51:05 +0000 (00:51 -0800)]

Fix bug #68799: Free called on unitialized pointer

commit | commitdiff | tree

Rasmus Lerdorf [Sat, 10 Jan 2015 02:08:36 +0000 (18:08 -0800)]

commit | commitdiff | tree

Rasmus Lerdorf [Sat, 10 Jan 2015 02:08:36 +0000 (18:08 -0800)]

commit | commitdiff | tree

Rasmus Lerdorf [Sat, 10 Jan 2015 00:23:50 +0000 (16:23 -0800)]

We can't output absolute S and T values for the
Diophantine solution here since it can vary based
on the libgmp version we are linking against and
in general there are almost always multiple valid
solutions

commit | commitdiff | tree

Rasmus Lerdorf [Sat, 10 Jan 2015 00:16:47 +0000 (16:16 -0800)]

commit | commitdiff | tree

Julien Pauli [Fri, 9 Jan 2015 15:25:02 +0000 (16:25 +0100)]

commit | commitdiff | tree

Julien Pauli [Fri, 9 Jan 2015 15:24:32 +0000 (16:24 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fix bug #68260

commit | commitdiff | tree

Julien Pauli [Fri, 9 Jan 2015 15:24:14 +0000 (16:24 +0100)]

commit | commitdiff | tree

Xinchen Hui [Fri, 9 Jan 2015 03:53:47 +0000 (11:53 +0800)]

Fixed bug (try block removed while combined with xdebug)

commit | commitdiff | tree

Adam Harvey [Thu, 8 Jan 2015 19:16:32 +0000 (19:16 +0000)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Calling crypt() with a salt of *0 should always return *1.
5.5.22 now

Conflicts:
configure.in
main/php_version.h

commit | commitdiff | tree

Adam Harvey [Thu, 8 Jan 2015 19:13:23 +0000 (19:13 +0000)]

Calling crypt() with a salt of *0 should always return *1.

commit | commitdiff | tree

Anatol Belski [Thu, 8 Jan 2015 17:11:15 +0000 (18:11 +0100)]

commit | commitdiff | tree

Julien Pauli [Wed, 7 Jan 2015 09:42:53 +0000 (10:42 +0100)]

commit | commitdiff | tree

Ferenc Kovacs [Tue, 6 Jan 2015 21:58:22 +0000 (22:58 +0100)]

commit | commitdiff | tree

Remi Collet [Tue, 6 Jan 2015 10:06:53 +0000 (11:06 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
cleanup old unused typedef

commit | commitdiff | tree

Remi Collet [Tue, 6 Jan 2015 10:06:25 +0000 (11:06 +0100)]

cleanup old unused typedef

commit | commitdiff | tree

Adam Harvey [Tue, 6 Jan 2015 01:27:37 +0000 (01:27 +0000)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Handle NULL strings in sapi_cli_server_register_variable().
Allow CLI server test scripts to specify the name of the router file.

Conflicts:
sapi/cli/tests/php_cli_server.inc

commit | commitdiff | tree

Adam Harvey [Tue, 6 Jan 2015 01:23:27 +0000 (01:23 +0000)]

Handle NULL strings in sapi_cli_server_register_variable().

Fixes bug #68745 (Invalid HTTP requests make web server segfault).

commit | commitdiff | tree

Adam Harvey [Tue, 6 Jan 2015 01:22:59 +0000 (01:22 +0000)]

Allow CLI server test scripts to specify the name of the router file.

This is required to write tests that behave differently when an index.php isn't
present in the document root. (Such as the one I'm about to commit.)

commit | commitdiff | tree

Anatol Belski [Mon, 5 Jan 2015 18:20:07 +0000 (19:20 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fix ACLs tests, make it create dir where it has to, not file

commit | commitdiff | tree

Anatol Belski [Mon, 5 Jan 2015 18:19:24 +0000 (19:19 +0100)]

fix ACLs tests, make it create dir where it has to, not file

commit | commitdiff | tree

Remi Collet [Mon, 5 Jan 2015 16:35:36 +0000 (17:35 +0100)]

commit | commitdiff | tree

Remi Collet [Mon, 5 Jan 2015 16:35:14 +0000 (17:35 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
NEWS
Fix bug #68751 listen.allowed_clients is broken

commit | commitdiff | tree

Remi Collet [Mon, 5 Jan 2015 16:34:45 +0000 (17:34 +0100)]

commit | commitdiff | tree

Remi Collet [Mon, 5 Jan 2015 16:33:57 +0000 (17:33 +0100)]

Fix bug #68751 listen.allowed_clients is broken

commit | commitdiff | tree

Matteo Beccati [Mon, 5 Jan 2015 11:11:46 +0000 (12:11 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Update test after fixing bug #68371

commit | commitdiff | tree

Matteo Beccati [Mon, 5 Jan 2015 11:11:16 +0000 (12:11 +0100)]

Update test after fixing bug #68371

commit | commitdiff | tree

Matteo Beccati [Mon, 5 Jan 2015 10:02:52 +0000 (11:02 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Updated NEWS for #68371

commit | commitdiff | tree

Matteo Beccati [Mon, 5 Jan 2015 10:01:54 +0000 (11:01 +0100)]

Updated NEWS for #68371

commit | commitdiff | tree

Matteo Beccati [Mon, 5 Jan 2015 10:00:11 +0000 (11:00 +0100)]

Ref #68371 - Added support for PDO::PGSQL_ATTR_DISABLE_PREPARES

commit | commitdiff | tree

Matteo Beccati [Mon, 5 Jan 2015 08:54:06 +0000 (09:54 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific attribute names

commit | commitdiff | tree

Matteo Beccati [Mon, 5 Jan 2015 08:25:48 +0000 (09:25 +0100)]

Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific attribute names

commit | commitdiff | tree

Stanislav Malyshev [Mon, 5 Jan 2015 05:08:16 +0000 (21:08 -0800)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fix memory leak

commit | commitdiff | tree

Stanislav Malyshev [Mon, 5 Jan 2015 05:07:57 +0000 (21:07 -0800)]

commit | commitdiff | tree

Stanislav Malyshev [Mon, 5 Jan 2015 04:54:46 +0000 (20:54 -0800)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixes #66764 - configure doesn't define EXPANDED_DATADIR / PHP_DATADIR correctly

commit | commitdiff | tree

Stanislav Malyshev [Mon, 5 Jan 2015 04:46:40 +0000 (20:46 -0800)]

Merge branch 'pull-request/975' into PHP-5.5

* pull-request/975:
Fixes #66764 - configure doesn't define EXPANDED_DATADIR / PHP_DATADIR correctly

commit | commitdiff | tree

Stanislav Malyshev [Mon, 5 Jan 2015 03:57:29 +0000 (19:57 -0800)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix GD tests with no GD loaded
  Fixed typo
  GD: imagepalettetotruecolor tests

commit | commitdiff | tree

Stanislav Malyshev [Mon, 5 Jan 2015 03:46:33 +0000 (19:46 -0800)]

Merge branch 'pull-request/742' into PHP-5.5

* pull-request/742:
Fixed typo
GD: imagepalettetotruecolor tests

commit | commitdiff | tree

Stanislav Malyshev [Mon, 5 Jan 2015 03:45:57 +0000 (19:45 -0800)]

fix GD tests with no GD loaded

commit | commitdiff | tree

Anatol Belski [Sun, 4 Jan 2015 16:07:32 +0000 (17:07 +0100)]

updated libmagic.patch in 5.6

commit | commitdiff | tree

Anatol Belski [Sun, 4 Jan 2015 16:06:15 +0000 (17:06 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
updated libmagic.patch in 5.5
updated libmagic.patch in 5.4

commit | commitdiff | tree

Anatol Belski [Sun, 4 Jan 2015 16:05:42 +0000 (17:05 +0100)]

updated libmagic.patch in 5.5

commit | commitdiff | tree

Anatol Belski [Sun, 4 Jan 2015 16:04:53 +0000 (17:04 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
updated libmagic.patch in 5.4

commit | commitdiff | tree

Anatol Belski [Sun, 4 Jan 2015 16:04:13 +0000 (17:04 +0100)]

updated libmagic.patch in 5.4

commit | commitdiff | tree

Anatol Belski [Sun, 4 Jan 2015 13:24:59 +0000 (14:24 +0100)]

commit | commitdiff | tree

Anatol Belski [Sun, 4 Jan 2015 13:23:56 +0000 (14:23 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
updated NEWS
Fixed bug #68735 fileinfo out-of-bounds memory access

commit | commitdiff | tree

Anatol Belski [Sun, 4 Jan 2015 13:23:33 +0000 (14:23 +0100)]

commit | commitdiff | tree

Anatol Belski [Sun, 4 Jan 2015 13:22:37 +0000 (14:22 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed bug #68735 fileinfo out-of-bounds memory access

commit | commitdiff | tree

Anatol Belski [Sun, 4 Jan 2015 13:20:21 +0000 (14:20 +0100)]

Fixed bug #68735 fileinfo out-of-bounds memory access

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom