]> granicus.if.org Git - php/log
projects / php / log
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
php
11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Johannes Schlüter [Sat, 18 Jan 2014 12:53:15 +0000 (13:53 +0100)]
Merge branch 'PHP-5.6'

11 years agoMerge branch 'phpdbg' into PHP-5.6
commit | commitdiff | tree
Johannes Schlüter [Sat, 18 Jan 2014 12:52:27 +0000 (13:52 +0100)]
Merge branch 'phpdbg' into PHP-5.6

11 years agozts fix
commit | commitdiff | tree
krakjoe [Fri, 17 Jan 2014 21:20:19 +0000 (21:20 +0000)]
zts fix

11 years ago...
commit | commitdiff | tree
krakjoe [Fri, 17 Jan 2014 21:15:03 +0000 (21:15 +0000)]
...

11 years agoremove goto from zend_try/zend_end_try/zend_catch blocks
commit | commitdiff | tree
krakjoe [Fri, 17 Jan 2014 21:08:35 +0000 (21:08 +0000)]
remove goto from zend_try/zend_end_try/zend_catch blocks

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Adam Harvey [Fri, 17 Jan 2014 12:29:31 +0000 (20:29 +0800)]
Merge branch 'PHP-5.6'

11 years agoAdd a couple of missing items to UPGRADING.
commit | commitdiff | tree
Adam Harvey [Fri, 17 Jan 2014 12:28:49 +0000 (20:28 +0800)]
Add a couple of missing items to UPGRADING.

Usual grumble about please ensuring UPGRADING gets updated goes here. :)

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Michael Wallner [Fri, 17 Jan 2014 11:19:17 +0000 (12:19 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Clarify always_populate_raw_post_data situation in 5.6

11 years agoClarify always_populate_raw_post_data situation in 5.6
commit | commitdiff | tree
Michael Wallner [Fri, 17 Jan 2014 11:18:16 +0000 (12:18 +0100)]
Clarify always_populate_raw_post_data situation in 5.6

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Anatol Belski [Fri, 17 Jan 2014 10:08:21 +0000 (11:08 +0100)]
Merge branch 'PHP-5.6'

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Anatol Belski [Fri, 17 Jan 2014 10:08:02 +0000 (11:08 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  added appropriate exception handling flag to ext\intl
  Update NEWS

11 years agoadded appropriate exception handling flag to ext\intl
commit | commitdiff | tree
Anatol Belski [Fri, 17 Jan 2014 10:03:40 +0000 (11:03 +0100)]
added appropriate exception handling flag to ext\intl

According to the doc page
http://msdn.microsoft.com/en-us/library/1deeycx5.aspx
it's appropriate as none of the extern C functions do throw
exceptions. This also fixes the warning C4530.

11 years agofix indentation
commit | commitdiff | tree
Antony Dovgal [Thu, 16 Jan 2014 13:53:40 +0000 (17:53 +0400)]
fix indentation

11 years agoAdd some basic and apparmor tests to fpm
commit | commitdiff | tree
Gernot Vormayr [Mon, 6 Jan 2014 23:21:24 +0000 (00:21 +0100)]
Add some basic and apparmor tests to fpm

11 years agoAdd --force-stderr to fpm
commit | commitdiff | tree
Gernot Vormayr [Mon, 6 Jan 2014 23:19:01 +0000 (00:19 +0100)]
Add --force-stderr to fpm

11 years agoAdd apparmor change hat functionality to fpm
commit | commitdiff | tree
Gernot Vormayr [Tue, 2 Jul 2013 11:06:02 +0000 (13:06 +0200)]
Add apparmor change hat functionality to fpm

11 years agoMerge branch 'master' of https://git.php.net/repository/php-src
commit | commitdiff | tree
Antony Dovgal [Fri, 17 Jan 2014 08:22:34 +0000 (12:22 +0400)]
Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src:
  forked the test for bug #66481

11 years agofix indentation
commit | commitdiff | tree
Antony Dovgal [Thu, 16 Jan 2014 13:53:40 +0000 (17:53 +0400)]
fix indentation

11 years agoUpdate NEWS
commit | commitdiff | tree
Yasuo Ohgaki [Fri, 17 Jan 2014 03:34:23 +0000 (12:34 +0900)]
Update NEWS

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Anatol Belski [Fri, 17 Jan 2014 02:32:26 +0000 (03:32 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  forked the test for bug #66481

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Anatol Belski [Fri, 17 Jan 2014 02:32:06 +0000 (03:32 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  forked the test for bug #66481

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Anatol Belski [Fri, 17 Jan 2014 02:31:38 +0000 (03:31 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  forked the test for bug #66481

11 years agoforked the test for bug #66481
commit | commitdiff | tree
Anatol Belski [Fri, 17 Jan 2014 02:30:42 +0000 (03:30 +0100)]
forked the test for bug #66481

11 years agofix #50
commit | commitdiff | tree
krakjoe [Thu, 16 Jan 2014 20:10:30 +0000 (20:10 +0000)]
fix #50

11 years agoMerge branch 'fpm-apparmor-fixed' of https://github.com/notti/php-src
commit | commitdiff | tree
Antony Dovgal [Thu, 16 Jan 2014 13:36:03 +0000 (17:36 +0400)]
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

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Xinchen Hui [Thu, 16 Jan 2014 06:42:14 +0000 (14:42 +0800)]
Merge branch 'PHP-5.6'

11 years agoMerge branch 'PHP-5.5' into 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

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
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

11 years agoRe-fixed Bug #66481 (Calls to session_name() segfault when session.name is null)
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)

11 years agoRevert "Bug #66481 Segfaults on session_name()"
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.

11 years agoRevert "Update NEWS"
commit | commitdiff | tree
Xinchen Hui [Thu, 16 Jan 2014 06:38:22 +0000 (14:38 +0800)]
Revert "Update NEWS"

This reverts commit 8f5de8ddcf5fea43928cf2358b95f3de1ab5ade9.

11 years agoUpdate NEWS
commit | commitdiff | tree
Yasuo Ohgaki [Thu, 16 Jan 2014 02:41:30 +0000 (11:41 +0900)]
Update NEWS

11 years agoUpdate NEWS
commit | commitdiff | tree
Yasuo Ohgaki [Thu, 16 Jan 2014 02:40:33 +0000 (11:40 +0900)]
Update NEWS

11 years agoMerge branch 'PHP-5.6'
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()

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
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()

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
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()

11 years agoBug #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().

11 years agoMerge branch 'PHP-5.6'
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

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

11 years agoLog 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

11 years agoMerge branch 'PHP-5.6'
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

11 years agoWe 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

11 years agoMerge branch 'PHP-5.6'
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

11 years agoAdded 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

11 years agoMerge branch 'PHP-5.6'
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.

11 years agoAlways initialize pg_version() result array elements to prevent failed test with...
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.

11 years agoMerge branch 'PHP-5.6'
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

11 years agoFixed 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

11 years agoMerge branch 'PHP-5.6'
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

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

11 years agoFixed session module is sending multiple set-cookie headers when session.use_strict_m...
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

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Xinchen Hui [Tue, 14 Jan 2014 14:34:53 +0000 (22:34 +0800)]
Merge branch 'PHP-5.6'

11 years agoFixed arguments unpacking segfault with opcache
commit | commitdiff | tree
Nikita Popov [Tue, 14 Jan 2014 14:34:08 +0000 (22:34 +0800)]
Fixed arguments unpacking segfault with opcache

11 years agofix uninitialized value
commit | commitdiff | tree
Anatol Belski [Tue, 14 Jan 2014 08:47:27 +0000 (09:47 +0100)]
fix uninitialized value

11 years agoMerge branch 'PHP-5.6'
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.

11 years agoMade 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.

11 years agoDont ignore errors from FT_Get_Glyph
commit | commitdiff | tree
Paul Tarjan [Tue, 14 Jan 2014 00:30:48 +0000 (16:30 -0800)]
Dont ignore errors from FT_Get_Glyph

11 years agoMerge branch 'master' of git.php.net:php-src
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

11 years agoMore refactoring of the big function generating execute requests
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

11 years agoissues raised in #46, don't quit on CTRL+C if not executing
commit | commitdiff | tree
krakjoe [Mon, 13 Jan 2014 20:16:50 +0000 (20:16 +0000)]
issues raised in #46, don't quit on CTRL+C if not executing

11 years agoMerge branch 'PHP-5.6'
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

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

11 years agoFixed ZTS build
commit | commitdiff | tree
Dmitry Stogov [Mon, 13 Jan 2014 19:09:59 +0000 (23:09 +0400)]
Fixed ZTS build

11 years agoMerge branch 'PHP-5.6'
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

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

11 years agoforked test for win32
commit | commitdiff | tree
Anatol Belski [Mon, 13 Jan 2014 16:12:14 +0000 (17:12 +0100)]
forked test for win32

11 years agoMerge branch 'PHP-5.6'
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)

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

11 years agoFixed bug #66461 (PHP crashes if opcache.interned_strings_buffer=0)
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)

11 years agoMerge branch 'PHP-5.6'
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)

11 years agoFixed bug #66440 (Optimisation of conditional JMPs based on pre-evaluate constant...
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)

11 years agoMerge branch 'master' of git.php.net:php-src
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

11 years agoMerge branch 'PHP-5.6'
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)

11 years agoFixed 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)

11 years agoMerge branch 'master' of git.php.net:php-src
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

11 years agomove common code into a function
commit | commitdiff | tree
Andrey Hristov [Mon, 13 Jan 2014 10:40:39 +0000 (12:40 +0200)]
move common code into a function

11 years agopatch version
commit | commitdiff | tree
krakjoe [Mon, 13 Jan 2014 08:19:37 +0000 (08:19 +0000)]
patch version

11 years agofix #46 ignore EOF
commit | commitdiff | tree
krakjoe [Mon, 13 Jan 2014 08:14:04 +0000 (08:14 +0000)]
fix #46 ignore EOF

11 years agoRevert "fix #46 ignore EOF"
commit | commitdiff | tree
krakjoe [Mon, 13 Jan 2014 08:12:49 +0000 (08:12 +0000)]
Revert "fix #46 ignore EOF"

This reverts commit 333264fdb718f337fb19d208e3d41aeef31f2ca1.

11 years agofix #46 ignore EOF
commit | commitdiff | tree
cyanogenmod [Mon, 13 Jan 2014 08:11:09 +0000 (08:11 +0000)]
fix #46 ignore EOF

11 years agoMerge branch 'PHP-5.6'
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)

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

11 years agoFixed bug #66474 (Optimizer bug in constant string to boolean conversion)
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)

11 years agowork on #46 (handle quit local consoles gracefully)
commit | commitdiff | tree
krakjoe [Sun, 12 Jan 2014 16:48:10 +0000 (16:48 +0000)]
work on #46 (handle quit local consoles gracefully)

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Bob Weinand [Sun, 12 Jan 2014 01:00:37 +0000 (02:00 +0100)]
Merge branch 'PHP-5.6'

11 years agoFixed build (making zend_is_by_ref_func_arg_fetch function static)
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)

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Nikita Popov [Sat, 11 Jan 2014 11:54:08 +0000 (12:54 +0100)]
Merge branch 'PHP-5.6'

11 years agoImplement argument unpacking
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

11 years agoMinor cleanup in zend_do_pass_param()
commit | commitdiff | tree
Nikita Popov [Wed, 28 Aug 2013 18:12:54 +0000 (20:12 +0200)]
Minor cleanup in zend_do_pass_param()

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Johannes Schlüter [Fri, 10 Jan 2014 15:04:29 +0000 (16:04 +0100)]
Merge branch 'PHP-5.6'

11 years agoMerge branch 'PHP-5.5' into 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

11 years agofix encoding
commit | commitdiff | tree
Johannes Schlüter [Fri, 10 Jan 2014 14:57:40 +0000 (15:57 +0100)]
fix encoding

11 years ago5.5.9-dev now
commit | commitdiff | tree
Julien Pauli [Fri, 10 Jan 2014 09:01:30 +0000 (10:01 +0100)]
5.5.9-dev now

11 years agoMerge branch 'PHP-5.6'
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

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
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

11 years agofixed 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

11 years agoMerge branch 'PHP-5.6'
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

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
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

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