granicus.if.org Git

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

commit | commitdiff | tree

Anatol Belski [Sun, 4 Jan 2015 08:42:46 +0000 (09:42 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
removed dead code

Conflicts:
ext/fileinfo/libmagic/readelf.c
ext/fileinfo/libmagic/readelf.h

commit | commitdiff | tree

Anatol Belski [Sun, 4 Jan 2015 08:40:56 +0000 (09:40 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
removed dead code

commit | commitdiff | tree

Remi Collet [Sun, 4 Jan 2015 08:40:19 +0000 (09:40 +0100)]

commit | commitdiff | tree

Ferenc Kovacs [Sat, 3 Jan 2015 18:18:07 +0000 (19:18 +0100)]

Fixes #66764 - configure doesn't define EXPANDED_DATADIR / PHP_DATADIR correctly

commit | commitdiff | tree

Ferenc Kovacs [Fri, 2 Jan 2015 09:15:01 +0000 (10:15 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixes #67960 - Long/short day names reversed in jddayofweek()

commit | commitdiff | tree

Greg Roach [Thu, 4 Sep 2014 21:29:26 +0000 (22:29 +0100)]

Fixes #67960 - Long/short day names reversed in jddayofweek()

commit | commitdiff | tree

Anatol Belski [Tue, 30 Dec 2014 19:22:51 +0000 (20:22 +0100)]

updated libmagic.patch

commit | commitdiff | tree

Anatol Belski [Tue, 30 Dec 2014 19:22:08 +0000 (20:22 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
updated libmagic.patch

commit | commitdiff | tree

Anatol Belski [Tue, 30 Dec 2014 19:21:28 +0000 (20:21 +0100)]

updated libmagic.patch

commit | commitdiff | tree

Anatol Belski [Tue, 30 Dec 2014 18:39:14 +0000 (19:39 +0100)]

commit | commitdiff | tree

Anatol Belski [Tue, 30 Dec 2014 18:38:08 +0000 (19:38 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed bug #68671 incorrect expression in libmagic

commit | commitdiff | tree

Anatol Belski [Tue, 30 Dec 2014 18:37:27 +0000 (19:37 +0100)]

Fixed bug #68671 incorrect expression in libmagic

commit | commitdiff | tree

Adam Harvey [Tue, 30 Dec 2014 17:59:39 +0000 (17:59 +0000)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Check the return value of lo_export.

commit | commitdiff | tree

Adam Harvey [Tue, 30 Dec 2014 17:47:19 +0000 (17:47 +0000)]

Check the return value of lo_export.

Patch by Ondřej Surý. Fixes bug #68697 (lo_export return -1 on failure).

commit | commitdiff | tree

Anatol Belski [Tue, 30 Dec 2014 15:52:17 +0000 (16:52 +0100)]

commit | commitdiff | tree

Anatol Belski [Tue, 30 Dec 2014 15:51:06 +0000 (16:51 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed bug #66679 Alignment Bug in PCRE 8.34 upstream
remove BOM from NEWS

commit | commitdiff | tree

Anatol Belski [Tue, 30 Dec 2014 15:50:22 +0000 (16:50 +0100)]

Fixed bug #66679 Alignment Bug in PCRE 8.34 upstream

commit | commitdiff | tree

Anatol Belski [Tue, 30 Dec 2014 15:47:10 +0000 (16:47 +0100)]

remove BOM from NEWS

commit | commitdiff | tree

Stanislav Malyshev [Tue, 30 Dec 2014 09:26:18 +0000 (01:26 -0800)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
FIx bug #68618 (out of bounds read crashes php-cgi)
Fixed bug #68676 (Explicit Double Free)

commit | commitdiff | tree

Stanislav Malyshev [Tue, 30 Dec 2014 09:25:30 +0000 (01:25 -0800)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
FIx bug #68618 (out of bounds read crashes php-cgi)

commit | commitdiff | tree

Stanislav Malyshev [Tue, 30 Dec 2014 09:23:05 +0000 (01:23 -0800)]

FIx bug #68618 (out of bounds read crashes php-cgi)

commit | commitdiff | tree

Kalle Sommer Nielsen [Mon, 29 Dec 2014 10:04:23 +0000 (11:04 +0100)]

Fixed bug #68676 (Explicit Double Free)

commit | commitdiff | tree

Kalle Sommer Nielsen [Mon, 29 Dec 2014 09:57:42 +0000 (10:57 +0100)]

Fixed bug #68676 (Explicit Double Free)

commit | commitdiff | tree

Anatol Belski [Sun, 28 Dec 2014 13:00:58 +0000 (14:00 +0100)]

commit | commitdiff | tree

Anatol Belski [Sun, 28 Dec 2014 12:58:01 +0000 (13:58 +0100)]

Fixed bug #68665 (Invalid free)

commit | commitdiff | tree

Keyur Govande [Fri, 26 Dec 2014 20:37:50 +0000 (20:37 +0000)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fix for failing tests. gcc 4.8.3 would optimize away the assigment.

commit | commitdiff | tree

Keyur Govande [Fri, 26 Dec 2014 20:36:19 +0000 (20:36 +0000)]

Fix for failing tests. gcc 4.8.3 would optimize away the assigment.

commit | commitdiff | tree

Remi Collet [Fri, 26 Dec 2014 07:35:08 +0000 (08:35 +0100)]

commit | commitdiff | tree

Remi Collet [Fri, 26 Dec 2014 07:33:21 +0000 (08:33 +0100)]

Fix bug #68656 Report gd library version

commit | commitdiff | tree

Xinchen Hui [Thu, 25 Dec 2014 11:21:14 +0000 (06:21 -0500)]

Merge branch 'PHP-5.5' into PHP-5.6

commit | commitdiff | tree

Xinchen Hui [Thu, 25 Dec 2014 11:20:52 +0000 (06:20 -0500)]

commit | commitdiff | tree

Xinchen Hui [Wed, 24 Dec 2014 09:55:58 +0000 (17:55 +0800)]

Fixed bug #68644 (strlen incorrect : mbstring + func_overload=2 +UTF-8 + Opcache)

commit | commitdiff | tree

Nikita Popov [Fri, 19 Dec 2014 20:45:54 +0000 (21:45 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

commit | commitdiff | tree

Nikita Popov [Fri, 19 Dec 2014 20:40:54 +0000 (21:40 +0100)]

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.

commit | commitdiff | tree

Remi Collet [Wed, 17 Dec 2014 10:00:52 +0000 (11:00 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Better fix for #68601 for perf https://bitbucket.org/libgd/gd-libgd/commits/81e9a993f2893d651d225646378e3fd1b7465467

commit | commitdiff | tree

Remi Collet [Wed, 17 Dec 2014 09:59:36 +0000 (10:59 +0100)]

Better fix for #68601 for perf
https://bitbucket.org/libgd/gd-libgd/commits/81e9a993f2893d651d225646378e3fd1b7465467

commit | commitdiff | tree

Ferenc Kovacs [Wed, 17 Dec 2014 01:18:29 +0000 (02:18 +0100)]

move this entry to the correct version

commit | commitdiff | tree

Ferenc Kovacs [Wed, 17 Dec 2014 01:14:25 +0000 (02:14 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  add missing NEWS entry
  add missing NEWS entry
  5.4.37

commit | commitdiff | tree

Ferenc Kovacs [Wed, 17 Dec 2014 01:13:59 +0000 (02:13 +0100)]

add missing NEWS entry

commit | commitdiff | tree

Ferenc Kovacs [Wed, 17 Dec 2014 01:13:13 +0000 (02:13 +0100)]

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

commit | commitdiff | tree

Ferenc Kovacs [Wed, 17 Dec 2014 01:10:36 +0000 (02:10 +0100)]

add missing NEWS entry

commit | commitdiff | tree

Ferenc Kovacs [Wed, 17 Dec 2014 00:59:38 +0000 (01:59 +0100)]

add NEWS entry for #68594

commit | commitdiff | tree

Stanislav Malyshev [Tue, 16 Dec 2014 19:44:41 +0000 (11:44 -0800)]

commit | commitdiff | tree

Stanislav Malyshev [Tue, 16 Dec 2014 18:19:32 +0000 (10:19 -0800)]

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

commit | commitdiff | tree

Stanislav Malyshev [Tue, 16 Dec 2014 18:18:07 +0000 (10:18 -0800)]

commit | commitdiff | tree

Stanislav Malyshev [Tue, 16 Dec 2014 18:17:07 +0000 (10:17 -0800)]

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()

commit | commitdiff | tree

Stanislav Malyshev [Tue, 16 Dec 2014 18:16:31 +0000 (10:16 -0800)]

commit | commitdiff | tree

Stanislav Malyshev [Fri, 12 Dec 2014 04:52:08 +0000 (20:52 -0800)]

add missing test file

commit | commitdiff | tree

Stanislav Malyshev [Fri, 12 Dec 2014 03:28:32 +0000 (19:28 -0800)]

Fix bug #68594 - Use after free vulnerability in unserialize()

commit | commitdiff | tree

Remi Collet [Tue, 16 Dec 2014 07:37:56 +0000 (08:37 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fix perms

commit | commitdiff | tree

Remi Collet [Tue, 16 Dec 2014 07:37:08 +0000 (08:37 +0100)]

commit | commitdiff | tree

Remi Collet [Sun, 14 Dec 2014 08:22:59 +0000 (09:22 +0100)]

commit | commitdiff | tree

Andrea Faulds [Sat, 13 Dec 2014 22:30:19 +0000 (22:30 +0000)]

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

commit | commitdiff | tree

Andrea Faulds [Sat, 13 Dec 2014 22:28:45 +0000 (22:28 +0000)]

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

commit | commitdiff | tree

Andrea Faulds [Sat, 13 Dec 2014 22:06:27 +0000 (22:06 +0000)]

Fix undefined behaviour in strnatcmp

commit | commitdiff | tree

Remi Collet [Sat, 13 Dec 2014 08:05:48 +0000 (09:05 +0100)]

commit | commitdiff | tree

Remi Collet [Sat, 13 Dec 2014 08:05:33 +0000 (09:05 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
NEWS
Fix bug #68601 buffer read overflow in gd_gif_in.c

commit | commitdiff | tree

Remi Collet [Sat, 13 Dec 2014 08:04:57 +0000 (09:04 +0100)]

commit | commitdiff | tree

Remi Collet [Sat, 13 Dec 2014 08:03:44 +0000 (09:03 +0100)]

Fix bug #68601 buffer read overflow in gd_gif_in.c

commit | commitdiff | tree

Julien Pauli [Fri, 12 Dec 2014 17:24:16 +0000 (18:24 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
pcntl_signal_dispatch: Speed up by preventing system calls when unnecessary

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

RSS Atom