granicus.if.org Git

Merge branch 'fpm-apparmor-fixed' of https://github.com/notti/php-src

* 'fpm-apparmor-fixed' of https://github.com/notti/php-src:
  Add some basic and apparmor tests to fpm
  Add --force-stderr to fpm
  Add apparmor change hat functionality to fpm

commit | commitdiff | tree

Xinchen Hui [Thu, 16 Jan 2014 06:42:14 +0000 (14:42 +0800)]

Merge branch 'PHP-5.6'

commit | commitdiff | tree

Xinchen Hui [Thu, 16 Jan 2014 06:42:04 +0000 (14:42 +0800)]

Merge branch 'PHP-5.5' into PHP-5.6

commit | commitdiff | tree

Xinchen Hui [Thu, 16 Jan 2014 06:41:52 +0000 (14:41 +0800)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Xinchen Hui [Thu, 16 Jan 2014 06:41:12 +0000 (14:41 +0800)]

Re-fixed Bug #66481 (Calls to session_name() segfault when session.name is null)

commit | commitdiff | tree

Xinchen Hui [Thu, 16 Jan 2014 06:38:35 +0000 (14:38 +0800)]

Revert "Bug #66481 Segfaults on session_name()"

This reverts commit 5662ffb295c6f9cb10768d8246f2656aae6b8abb.

commit | commitdiff | tree

Xinchen Hui [Thu, 16 Jan 2014 06:38:22 +0000 (14:38 +0800)]

Revert "Update NEWS"

This reverts commit 8f5de8ddcf5fea43928cf2358b95f3de1ab5ade9.

commit | commitdiff | tree

Yasuo Ohgaki [Thu, 16 Jan 2014 02:41:30 +0000 (11:41 +0900)]

commit | commitdiff | tree

Yasuo Ohgaki [Thu, 16 Jan 2014 02:40:33 +0000 (11:40 +0900)]

commit | commitdiff | tree

Yasuo Ohgaki [Thu, 16 Jan 2014 02:35:57 +0000 (11:35 +0900)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Bug #66481 Segfaults on session_name()

commit | commitdiff | tree

Yasuo Ohgaki [Thu, 16 Jan 2014 02:35:11 +0000 (11:35 +0900)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Bug #66481 Segfaults on session_name()

commit | commitdiff | tree

Yasuo Ohgaki [Thu, 16 Jan 2014 02:34:31 +0000 (11:34 +0900)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Bug #66481 Segfaults on session_name()

commit | commitdiff | tree

Conor McDermottroe [Tue, 14 Jan 2014 02:08:13 +0000 (02:08 +0000)]

Bug #66481 Segfaults on session_name()

If the previous value of session.name was NULL then any call to
session_name($string) would result in a segmentation fault.

This changes the behaviour to set the value of session.name to
"PHPSESSID" if a blank value is given in php.ini or via -d on the
command line. There is already protection against setting it to NULL via
session_name() or ini_set().

commit | commitdiff | tree

Dmitry Stogov [Wed, 15 Jan 2014 08:15:41 +0000 (12:15 +0400)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Log information about cached scripts and keys

commit | commitdiff | tree

Dmitry Stogov [Wed, 15 Jan 2014 08:15:25 +0000 (12:15 +0400)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Log information about cached scripts and keys

commit | commitdiff | tree

Dmitry Stogov [Wed, 15 Jan 2014 08:12:22 +0000 (12:12 +0400)]

Log information about cached scripts and keys

commit | commitdiff | tree

Dmitry Stogov [Wed, 15 Jan 2014 07:11:01 +0000 (11:11 +0400)]

Merge branch 'PHP-5.6'

* PHP-5.6:
We don't know PHP_5_6_X_API_NO yet

commit | commitdiff | tree

Dmitry Stogov [Wed, 15 Jan 2014 07:09:38 +0000 (11:09 +0400)]

We don't know PHP_5_6_X_API_NO yet

commit | commitdiff | tree

Yasuo Ohgaki [Wed, 15 Jan 2014 05:39:56 +0000 (14:39 +0900)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Added pg_lo_truncate() and 64bit large object support from PostgreSQL 9.3 and up

commit | commitdiff | tree

Yasuo Ohgaki [Wed, 15 Jan 2014 05:37:24 +0000 (14:37 +0900)]

Added pg_lo_truncate() and 64bit large object support from PostgreSQL 9.3 and up

commit | commitdiff | tree

Yasuo Ohgaki [Wed, 15 Jan 2014 05:28:08 +0000 (14:28 +0900)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Always initialize pg_version() result array elements to prevent failed test with older postgresql servers. Add missing client_encoding element.

commit | commitdiff | tree

Yasuo Ohgaki [Wed, 15 Jan 2014 05:27:33 +0000 (14:27 +0900)]

Always initialize pg_version() result array elements to prevent failed test with older postgresql servers. Add missing client_encoding element.

commit | commitdiff | tree

Yasuo Ohgaki [Wed, 15 Jan 2014 04:32:43 +0000 (13:32 +0900)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Fixed pg_version() crash with older postgresql

commit | commitdiff | tree

Yasuo Ohgaki [Wed, 15 Jan 2014 04:32:15 +0000 (13:32 +0900)]

Fixed pg_version() crash with older postgresql

commit | commitdiff | tree

Yasuo Ohgaki [Wed, 15 Jan 2014 02:07:51 +0000 (11:07 +0900)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Fixed session module is sending multiple set-cookie headers when session.use_strict_mode=1

commit | commitdiff | tree

Yasuo Ohgaki [Wed, 15 Jan 2014 02:07:10 +0000 (11:07 +0900)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed session module is sending multiple set-cookie headers when session.use_strict_mode=1

commit | commitdiff | tree

Yasuo Ohgaki [Wed, 15 Jan 2014 02:03:07 +0000 (11:03 +0900)]

Fixed session module is sending multiple set-cookie headers when session.use_strict_mode=1

commit | commitdiff | tree

Xinchen Hui [Tue, 14 Jan 2014 14:34:53 +0000 (22:34 +0800)]

Merge branch 'PHP-5.6'

commit | commitdiff | tree

Nikita Popov [Tue, 14 Jan 2014 14:34:08 +0000 (22:34 +0800)]

Fixed arguments unpacking segfault with opcache

commit | commitdiff | tree

Anatol Belski [Tue, 14 Jan 2014 08:47:27 +0000 (09:47 +0100)]

fix uninitialized value

commit | commitdiff | tree

Yasuo Ohgaki [Tue, 14 Jan 2014 01:16:43 +0000 (10:16 +0900)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Made pg_version() return full connection info.

commit | commitdiff | tree

Yasuo Ohgaki [Tue, 14 Jan 2014 01:10:48 +0000 (10:10 +0900)]

Made pg_version() return full connection info.

commit | commitdiff | tree

Paul Tarjan [Tue, 14 Jan 2014 00:30:48 +0000 (16:30 -0800)]

Dont ignore errors from FT_Get_Glyph

commit | commitdiff | tree

Andrey Hristov [Mon, 13 Jan 2014 23:32:36 +0000 (01:32 +0200)]

Merge branch 'master' of git.php.net:php-src

commit | commitdiff | tree

Andrey Hristov [Mon, 13 Jan 2014 23:31:16 +0000 (01:31 +0200)]

More refactoring of the big function generating execute requests

commit | commitdiff | tree

Dmitry Stogov [Mon, 13 Jan 2014 19:11:36 +0000 (23:11 +0400)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Fixed ZTS build

commit | commitdiff | tree

Dmitry Stogov [Mon, 13 Jan 2014 19:10:35 +0000 (23:10 +0400)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed ZTS build

commit | commitdiff | tree

Dmitry Stogov [Mon, 13 Jan 2014 19:09:59 +0000 (23:09 +0400)]

commit | commitdiff | tree

Anatol Belski [Mon, 13 Jan 2014 16:13:11 +0000 (17:13 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
forked test for win32

commit | commitdiff | tree

Anatol Belski [Mon, 13 Jan 2014 16:12:53 +0000 (17:12 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
forked test for win32

commit | commitdiff | tree

Anatol Belski [Mon, 13 Jan 2014 16:12:14 +0000 (17:12 +0100)]

forked test for win32

commit | commitdiff | tree

Dmitry Stogov [Mon, 13 Jan 2014 14:07:26 +0000 (18:07 +0400)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Fixed bug #66461 (PHP crashes if opcache.interned_strings_buffer=0)

commit | commitdiff | tree

Dmitry Stogov [Mon, 13 Jan 2014 14:06:49 +0000 (18:06 +0400)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed bug #66461 (PHP crashes if opcache.interned_strings_buffer=0)

Conflicts:
NEWS

commit | commitdiff | tree

Dmitry Stogov [Mon, 13 Jan 2014 14:05:21 +0000 (18:05 +0400)]

Fixed bug #66461 (PHP crashes if opcache.interned_strings_buffer=0)

commit | commitdiff | tree

Dmitry Stogov [Mon, 13 Jan 2014 12:16:57 +0000 (16:16 +0400)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Fixed bug #66440 (Optimisation of conditional JMPs based on pre-evaluate constant function calls)

commit | commitdiff | tree

Dmitry Stogov [Mon, 13 Jan 2014 12:16:23 +0000 (16:16 +0400)]

Fixed bug #66440 (Optimisation of conditional JMPs based on pre-evaluate constant function calls)

commit | commitdiff | tree

Dmitry Stogov [Mon, 13 Jan 2014 11:36:37 +0000 (15:36 +0400)]

Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
move common code into a function

commit | commitdiff | tree

Dmitry Stogov [Mon, 13 Jan 2014 11:36:06 +0000 (15:36 +0400)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Fixed bug #66471 (Keep backward compatibility)

commit | commitdiff | tree

Dmitry Stogov [Mon, 13 Jan 2014 11:34:25 +0000 (15:34 +0400)]

Fixed bug #66471 (Keep backward compatibility)

commit | commitdiff | tree

Andrey Hristov [Mon, 13 Jan 2014 10:40:59 +0000 (12:40 +0200)]

Merge branch 'master' of git.php.net:php-src

commit | commitdiff | tree

Andrey Hristov [Mon, 13 Jan 2014 10:40:39 +0000 (12:40 +0200)]

move common code into a function

commit | commitdiff | tree

Dmitry Stogov [Mon, 13 Jan 2014 08:08:23 +0000 (12:08 +0400)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Fixed bug #66474 (Optimizer bug in constant string to boolean conversion)

commit | commitdiff | tree

Dmitry Stogov [Mon, 13 Jan 2014 08:07:50 +0000 (12:07 +0400)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed bug #66474 (Optimizer bug in constant string to boolean conversion)

Conflicts:
NEWS

commit | commitdiff | tree

Dmitry Stogov [Mon, 13 Jan 2014 08:06:19 +0000 (12:06 +0400)]

Fixed bug #66474 (Optimizer bug in constant string to boolean conversion)

commit | commitdiff | tree

Bob Weinand [Sun, 12 Jan 2014 01:00:37 +0000 (02:00 +0100)]

Merge branch 'PHP-5.6'

commit | commitdiff | tree

Bob Weinand [Sun, 12 Jan 2014 00:59:22 +0000 (01:59 +0100)]

Fixed build (making zend_is_by_ref_func_arg_fetch function static)

commit | commitdiff | tree

Nikita Popov [Sat, 11 Jan 2014 11:54:08 +0000 (12:54 +0100)]

Merge branch 'PHP-5.6'

commit | commitdiff | tree

Nikita Popov [Thu, 29 Aug 2013 09:35:11 +0000 (11:35 +0200)]

Implement argument unpacking

RFC: https://wiki.php.net/rfc/argument_unpacking

commit | commitdiff | tree

Nikita Popov [Wed, 28 Aug 2013 18:12:54 +0000 (20:12 +0200)]

Minor cleanup in zend_do_pass_param()

commit | commitdiff | tree

Johannes Schlüter [Fri, 10 Jan 2014 15:04:29 +0000 (16:04 +0100)]

Merge branch 'PHP-5.6'

commit | commitdiff | tree

Johannes Schlüter [Fri, 10 Jan 2014 15:02:46 +0000 (16:02 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

commit | commitdiff | tree

Johannes Schlüter [Fri, 10 Jan 2014 14:57:40 +0000 (15:57 +0100)]

commit | commitdiff | tree

Julien Pauli [Fri, 10 Jan 2014 09:01:30 +0000 (10:01 +0100)]

commit | commitdiff | tree

Anatol Belski [Thu, 9 Jan 2014 14:29:16 +0000 (15:29 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
fixed EOL in the test

commit | commitdiff | tree

Anatol Belski [Thu, 9 Jan 2014 14:28:47 +0000 (15:28 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fixed EOL in the test

commit | commitdiff | tree

Anatol Belski [Thu, 9 Jan 2014 14:28:09 +0000 (15:28 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fixed EOL in the test

commit | commitdiff | tree

Anatol Belski [Thu, 9 Jan 2014 14:27:26 +0000 (15:27 +0100)]

fixed EOL in the test

commit | commitdiff | tree

Anatol Belski [Thu, 9 Jan 2014 14:25:18 +0000 (15:25 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
added testcase from bug #65371

commit | commitdiff | tree

Anatol Belski [Thu, 9 Jan 2014 14:24:55 +0000 (15:24 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
added testcase from bug #65371

commit | commitdiff | tree

Anatol Belski [Thu, 9 Jan 2014 14:24:31 +0000 (15:24 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
added testcase from bug #65371

commit | commitdiff | tree

Anatol Belski [Thu, 9 Jan 2014 14:23:49 +0000 (15:23 +0100)]

added testcase from bug #65371

commit | commitdiff | tree

Dmitry Stogov [Thu, 9 Jan 2014 09:50:12 +0000 (13:50 +0400)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Fixed ADD_INTERNED_STRING() logic to support strings that are already interned. (Terry)

commit | commitdiff | tree

Dmitry Stogov [Thu, 9 Jan 2014 09:49:54 +0000 (13:49 +0400)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed ADD_INTERNED_STRING() logic to support strings that are already interned. (Terry)

commit | commitdiff | tree

Dmitry Stogov [Thu, 9 Jan 2014 09:48:08 +0000 (13:48 +0400)]

Fixed ADD_INTERNED_STRING() logic to support strings that are already interned. (Terry)

commit | commitdiff | tree

Gernot Vormayr [Mon, 6 Jan 2014 23:21:24 +0000 (00:21 +0100)]

Add some basic and apparmor tests to fpm

commit | commitdiff | tree

Gernot Vormayr [Mon, 6 Jan 2014 23:19:01 +0000 (00:19 +0100)]

Add --force-stderr to fpm

commit | commitdiff | tree

Scott MacVicar [Mon, 6 Jan 2014 17:06:33 +0000 (17:06 +0000)]

Merge branch 'PHP-5.6'

* PHP-5.6:
[libxml] Unit test for libxml_disable_entity_loader()

commit | commitdiff | tree

Scott MacVicar [Mon, 6 Jan 2014 17:05:34 +0000 (17:05 +0000)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
[libxml] Unit test for libxml_disable_entity_loader()

commit | commitdiff | tree

Scott MacVicar [Mon, 6 Jan 2014 17:05:16 +0000 (17:05 +0000)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
[libxml] Unit test for libxml_disable_entity_loader()

commit | commitdiff | tree

Scott MacVicar [Sun, 5 Jan 2014 10:11:05 +0000 (02:11 -0800)]

[libxml] Unit test for libxml_disable_entity_loader()

Summary:
Test to make sure libxml_disable_entity_loader() is behaving.

commit | commitdiff | tree

Anatol Belski [Sun, 5 Jan 2014 18:22:11 +0000 (19:22 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
one more extension for the basename test

commit | commitdiff | tree

Anatol Belski [Sun, 5 Jan 2014 18:21:49 +0000 (19:21 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
one more extension for the basename test

commit | commitdiff | tree

Anatol Belski [Sun, 5 Jan 2014 18:21:27 +0000 (19:21 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
one more extension for the basename test

commit | commitdiff | tree

Anatol Belski [Sun, 5 Jan 2014 18:19:54 +0000 (19:19 +0100)]

one more extension for the basename test

commit | commitdiff | tree

Anatol Belski [Sun, 5 Jan 2014 18:13:40 +0000 (19:13 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
  improved the fix for bug #66395
  Fixed bug #66009 Failed compilation of PHP extension with C++ std library using VS 2012
  updated NEWS
  Fixed bug #66009 Failed compilation of PHP extension with C++ std library using VS 2012

commit | commitdiff | tree

Anatol Belski [Sun, 5 Jan 2014 18:13:15 +0000 (19:13 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  improved the fix for bug #66395
  updated NEWS
  Fixed bug #66009 Failed compilation of PHP extension with C++ std library using VS 2012

commit | commitdiff | tree

Anatol Belski [Sun, 5 Jan 2014 18:12:52 +0000 (19:12 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
improved the fix for bug #66395

commit | commitdiff | tree

Anatol Belski [Sun, 5 Jan 2014 18:05:04 +0000 (19:05 +0100)]

improved the fix for bug #66395

- fixed the traverse vulnerability in case like c:d:file.txt
- ensure paths containing NTFS streams are still worky

commit | commitdiff | tree

Anatol Belski [Fri, 3 Jan 2014 23:47:10 +0000 (00:47 +0100)]

Fixed bug #66009 Failed compilation of PHP extension with C++ std library using VS 2012

Visual Studio 2012 includes sanity checks for C++11 features, see
http://msdn.microsoft.com/en-us/library/vstudio/bb531344(v=vs.110).aspx
To fix the 'inline' keyword redefinition for C++ in debug mode, the
new macros ZEND_WIN32_KEEP_INLINE is introduced, ZEND_WIN32_FORCE_INLINE is
automatically appended in release mode.

commit | commitdiff | tree

Anatol Belski [Fri, 3 Jan 2014 23:47:10 +0000 (00:47 +0100)]

commit | commitdiff | tree

Anatol Belski [Fri, 3 Jan 2014 23:59:03 +0000 (00:59 +0100)]

commit | commitdiff | tree

Anatol Belski [Fri, 3 Jan 2014 23:47:10 +0000 (00:47 +0100)]

commit | commitdiff | tree

Nikita Popov [Sat, 4 Jan 2014 00:30:44 +0000 (01:30 +0100)]

Merge branch 'PHP-5.6'

commit | commitdiff | tree

Nikita Popov [Sat, 4 Jan 2014 00:29:15 +0000 (01:29 +0100)]