]>
granicus.if.org Git - php/log
Xinchen Hui [Thu, 8 Jan 2015 08:09:02 +0000 (16:09 +0800)]
Fixed bug #68739 #68740 #68741
Adam Harvey [Tue, 6 Jan 2015 01:29:40 +0000 (01:29 +0000)]
Merge branch 'PHP-5.6'
* PHP-5.6:
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/php_cli_server.c
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
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).
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.)
Levi Morrison [Tue, 6 Jan 2015 00:27:25 +0000 (17:27 -0700)]
Fix bug #55416
Remove extra, unnecessary warning when the callback fails for
array_map, array_reduce and array_filter
Anatol Belski [Mon, 5 Jan 2015 18:20:33 +0000 (19:20 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix ACLs tests, make it create dir where it has to, not file
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
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
Anatol Belski [Mon, 5 Jan 2015 18:14:12 +0000 (19:14 +0100)]
fix ACLs setup for tests
Remi Collet [Mon, 5 Jan 2015 16:36:26 +0000 (17:36 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
NEWS
NEWS
Fix bug #68751 listen.allowed_clients is broken
Remi Collet [Mon, 5 Jan 2015 16:35:36 +0000 (17:35 +0100)]
NEWS
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
Remi Collet [Mon, 5 Jan 2015 16:34:45 +0000 (17:34 +0100)]
NEWS
Remi Collet [Mon, 5 Jan 2015 16:33:57 +0000 (17:33 +0100)]
Fix bug #68751 listen.allowed_clients is broken
Nikita Popov [Mon, 5 Jan 2015 16:02:11 +0000 (17:02 +0100)]
Fix uses of zval_add_ref and add comment on usage
zval_add_ref should be used as a copy ctor, after the value was
already copied.
In particular when used with hash insertions, it should be applied
to the return value of the insert function.
Xinchen Hui [Mon, 5 Jan 2015 14:21:56 +0000 (22:21 +0800)]
Merge branch 'master' of https://git.php.net/repository/php-src
Xinchen Hui [Mon, 5 Jan 2015 14:20:13 +0000 (22:20 +0800)]
Add test script and use efree_size
Xinchen Hui [Mon, 5 Jan 2015 14:13:22 +0000 (22:13 +0800)]
Revert "Revert "Fix memory leak when dereferencing reference with refcount 1""
This reverts commit
7aab9659ee9c8bc15490d16b4064d64a3846147c.
Matteo Beccati [Mon, 5 Jan 2015 11:12:02 +0000 (12:12 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Update test after fixing bug #68371
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
Matteo Beccati [Mon, 5 Jan 2015 11:11:16 +0000 (12:11 +0100)]
Update test after fixing bug #68371
Matteo Beccati [Mon, 5 Jan 2015 10:03:50 +0000 (11:03 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Updated NEWS for #68371
Ref #68371 - Added support for PDO::PGSQL_ATTR_DISABLE_PREPARES
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
Matteo Beccati [Mon, 5 Jan 2015 10:01:54 +0000 (11:01 +0100)]
Updated NEWS for #68371
Matteo Beccati [Mon, 5 Jan 2015 10:00:11 +0000 (11:00 +0100)]
Ref #68371 - Added support for PDO::PGSQL_ATTR_DISABLE_PREPARES
Matteo Beccati [Mon, 5 Jan 2015 09:48:40 +0000 (10:48 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific attribute names
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
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
Xinchen Hui [Mon, 5 Jan 2015 05:26:33 +0000 (00:26 -0500)]
Merge branch 'master' of https://git.php.net/repository/php-src
Xinchen Hui [Mon, 5 Jan 2015 05:26:10 +0000 (00:26 -0500)]
Revert "Fix memory leak when dereferencing reference with refcount 1"
This reverts commit
f4cb5cc09d44e6940fecebe52b8013b288ed67c4.
breaks tests Zend/tests/bug27268.phpt and Zend/tests/bug68262.phpt
Stanislav Malyshev [Mon, 5 Jan 2015 05:08:24 +0000 (21:08 -0800)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix memory leak
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
Stanislav Malyshev [Mon, 5 Jan 2015 05:07:57 +0000 (21:07 -0800)]
fix memory leak
Stanislav Malyshev [Mon, 5 Jan 2015 04:55:25 +0000 (20:55 -0800)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixes #66764 - configure doesn't define EXPANDED_DATADIR / PHP_DATADIR correctly
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
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
Stanislav Malyshev [Mon, 5 Jan 2015 03:57:46 +0000 (19:57 -0800)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix GD tests with no GD loaded
Fixed typo
GD: imagepalettetotruecolor tests
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
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
Stanislav Malyshev [Mon, 5 Jan 2015 03:45:57 +0000 (19:45 -0800)]
fix GD tests with no GD loaded
Gustavo Frederico Temple Pedrosa [Tue, 16 Dec 2014 19:10:32 +0000 (19:10 +0000)]
Specifying MACRO for ppc64
Add PowerPC64 too, which is capable to access unaligned words.
Chris Christoff [Sat, 6 Dec 2014 01:59:07 +0000 (20:59 -0500)]
Formatting fixes for git rules file
Formatting fixes for git rules file
This commit fixes 2 issues with the git rules
file. First, a typo of "::" has been changed to
":". Second, an extraneous space has been
removed.
Xinchen Hui [Mon, 5 Jan 2015 03:08:35 +0000 (22:08 -0500)]
Still -1 on *BSD now
Xinchen Hui [Mon, 5 Jan 2015 03:04:32 +0000 (22:04 -0500)]
Stanislav Malyshev [Mon, 5 Jan 2015 03:00:05 +0000 (19:00 -0800)]
Merge branch 'pull-request/731'
* pull-request/731:
Set FPM_BACKLOG_DEFAULT to 511
Bob Weinand [Sun, 4 Jan 2015 23:28:53 +0000 (00:28 +0100)]
Fix memory leak when dereferencing reference with refcount 1
Nikita Popov [Sun, 4 Jan 2015 17:07:44 +0000 (18:07 +0100)]
Add missing string cast for non-cv var fetches
Nikita Popov [Sun, 4 Jan 2015 16:57:23 +0000 (17:57 +0100)]
Fix use after free for variables with integer names
Anatol Belski [Sun, 4 Jan 2015 16:09:06 +0000 (17:09 +0100)]
updated libmagic.patch
Anatol Belski [Sun, 4 Jan 2015 16:08:15 +0000 (17:08 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated libmagic.patch in 5.6
updated libmagic.patch in 5.5
updated libmagic.patch in 5.4
Anatol Belski [Sun, 4 Jan 2015 16:07:32 +0000 (17:07 +0100)]
updated libmagic.patch in 5.6
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
Anatol Belski [Sun, 4 Jan 2015 16:05:42 +0000 (17:05 +0100)]
updated libmagic.patch in 5.5
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
Anatol Belski [Sun, 4 Jan 2015 16:04:13 +0000 (17:04 +0100)]
updated libmagic.patch in 5.4
Anatol Belski [Sun, 4 Jan 2015 13:25:28 +0000 (14:25 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
updated NEWS
Fixed bug #68735 fileinfo out-of-bounds memory access
Anatol Belski [Sun, 4 Jan 2015 13:24:59 +0000 (14:24 +0100)]
updated NEWS
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
Anatol Belski [Sun, 4 Jan 2015 13:23:33 +0000 (14:23 +0100)]
updated NEWS
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
Anatol Belski [Sun, 4 Jan 2015 13:20:21 +0000 (14:20 +0100)]
Fixed bug #68735 fileinfo out-of-bounds memory access
Anatol Belski [Sun, 4 Jan 2015 08:43:33 +0000 (09:43 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
removed dead code
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
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
Remi Collet [Sun, 4 Jan 2015 08:40:19 +0000 (09:40 +0100)]
removed dead code
Stanislav Malyshev [Sun, 4 Jan 2015 05:55:29 +0000 (21:55 -0800)]
Fix bug #68706 - uninitalized pointer in mbstring
Ferenc Kovacs [Sat, 3 Jan 2015 18:18:07 +0000 (19:18 +0100)]
Fixes #66764 - configure doesn't define EXPANDED_DATADIR / PHP_DATADIR correctly
Remi Collet [Sat, 3 Jan 2015 07:34:27 +0000 (08:34 +0100)]
Fix Bug #68713 infinite loop / infinite free
PHP not affected (emalloc never return NULL)
Just to reduce diff with upstream and for legibility
Apply:
https://bitbucket.org/libgd/gd-libgd/commits/
3c0d2203b2672b688d4d2326ff3a60b019879062
https://bitbucket.org/libgd/gd-libgd/commits/
4af76c97a478d4e7c4b64e08ac67abbca7cbd0fb
Ferenc Kovacs [Fri, 2 Jan 2015 09:16:37 +0000 (10:16 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixes #67960 - Long/short day names reversed in jddayofweek()
Conflicts:
ext/calendar/calendar.c
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()
Greg Roach [Thu, 4 Sep 2014 21:29:26 +0000 (22:29 +0100)]
Fixes #67960 - Long/short day names reversed in jddayofweek()
Anatol Belski [Wed, 31 Dec 2014 13:47:14 +0000 (14:47 +0100)]
cleanup redundand macros
Sara Golemon [Tue, 30 Dec 2014 21:54:02 +0000 (13:54 -0800)]
Allow the third arg to DateTime(Immutable)::createFromFormat() to be null.
Permit the same meaning as not passing the arg at all.
Anatol Belski [Tue, 30 Dec 2014 19:28:52 +0000 (20:28 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated libmagic.patch
updated libmagic.patch
Anatol Belski [Tue, 30 Dec 2014 19:28:13 +0000 (20:28 +0100)]
updated libmagic.patch
Anatol Belski [Tue, 30 Dec 2014 19:22:51 +0000 (20:22 +0100)]
updated libmagic.patch
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
Anatol Belski [Tue, 30 Dec 2014 19:21:28 +0000 (20:21 +0100)]
updated libmagic.patch
Anatol Belski [Tue, 30 Dec 2014 18:41:07 +0000 (19:41 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
Fixed bug #68671 incorrect expression in libmagic
Conflicts:
ext/fileinfo/libmagic/print.c
Anatol Belski [Tue, 30 Dec 2014 18:39:14 +0000 (19:39 +0100)]
updated NEWS
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
Anatol Belski [Tue, 30 Dec 2014 18:37:27 +0000 (19:37 +0100)]
Fixed bug #68671 incorrect expression in libmagic
Adam Harvey [Tue, 30 Dec 2014 18:01:51 +0000 (18:01 +0000)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Check the return value of lo_export.
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.
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).
Anatol Belski [Tue, 30 Dec 2014 15:52:54 +0000 (16:52 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
Fixed bug #66679 Alignment Bug in PCRE 8.34 upstream
remove BOM from NEWS
Anatol Belski [Tue, 30 Dec 2014 15:52:17 +0000 (16:52 +0100)]
updated NEWS
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
Anatol Belski [Tue, 30 Dec 2014 15:50:22 +0000 (16:50 +0100)]
Fixed bug #66679 Alignment Bug in PCRE 8.34 upstream
Anatol Belski [Tue, 30 Dec 2014 15:47:10 +0000 (16:47 +0100)]
remove BOM from NEWS
Dmitry Stogov [Tue, 30 Dec 2014 15:15:15 +0000 (18:15 +0300)]
Simplify array_splice()
Dmitry Stogov [Tue, 30 Dec 2014 14:04:24 +0000 (17:04 +0300)]
Simplify array_unshift()
Dmitry Stogov [Tue, 30 Dec 2014 14:03:38 +0000 (17:03 +0300)]
Simplify array_pad()
Stanislav Malyshev [Tue, 30 Dec 2014 09:27:20 +0000 (01:27 -0800)]
Merge branch 'PHP-5.6'
* PHP-5.6:
FIx bug #68618 (out of bounds read crashes php-cgi)
Fixed bug #68676 (Explicit Double Free)
Fixed bug #68676 (Explicit Double Free)
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)
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)
Stanislav Malyshev [Tue, 30 Dec 2014 09:23:05 +0000 (01:23 -0800)]
FIx bug #68618 (out of bounds read crashes php-cgi)
Stanislav Malyshev [Tue, 30 Dec 2014 08:16:21 +0000 (00:16 -0800)]
Make the code lesss suspicious (can't be really 0 but it's not obvious)
Stanislav Malyshev [Mon, 29 Dec 2014 23:04:00 +0000 (15:04 -0800)]
Merge branch 'intl_size_t'
* intl_size_t:
cleanup intl types
projects / php / log