]> granicus.if.org Git - php/log
php
12 years agoDo not add a ref to EX(object) on generator clone
Nikita Popov [Thu, 20 Dec 2012 19:33:18 +0000 (20:33 +0100)]
Do not add a ref to EX(object) on generator clone

If a ref has to be added it will be already added while walking the call
slots.

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Rasmus Lerdorf [Thu, 20 Dec 2012 04:00:41 +0000 (23:00 -0500)]
Merge branch 'PHP-5.4' into PHP-5.5

12 years agoFix for bug #63811
Rasmus Lerdorf [Thu, 20 Dec 2012 03:58:18 +0000 (22:58 -0500)]
Fix for bug #63811

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Pierrick Charron [Thu, 20 Dec 2012 00:46:57 +0000 (19:46 -0500)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #55438 (Curlwapper is not sending http header randomly)

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Pierrick Charron [Thu, 20 Dec 2012 00:44:08 +0000 (19:44 -0500)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #55438 (Curlwapper is not sending http header randomly)

12 years agoFixed bug #55438 (Curlwapper is not sending http header randomly)
Pierrick Charron [Thu, 20 Dec 2012 00:40:29 +0000 (19:40 -0500)]
Fixed bug #55438 (Curlwapper is not sending http header randomly)

Since curl multi is used, it sometime happen that the resource is freed before
the curl multi really execute the query. The patch will store the headers
slist in the curlstream handle and free it only when the stream will be closed

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Johannes Schlüter [Wed, 19 Dec 2012 16:01:44 +0000 (17:01 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Andrey Hristov [Wed, 19 Dec 2012 15:58:34 +0000 (16:58 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
ext/mysqlnd/mysqlnd_alloc.c

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Johannes Schlüter [Wed, 19 Dec 2012 15:17:18 +0000 (16:17 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoUpdate release date
Johannes Schlüter [Wed, 19 Dec 2012 15:15:39 +0000 (16:15 +0100)]
Update release date

12 years agoAdd missing zend_do_free call
Nikita Popov [Wed, 19 Dec 2012 14:21:34 +0000 (15:21 +0100)]
Add missing zend_do_free call

This is a followup to d53f1bf8ab. When the yield *statement* is used its
return value still needs to be freed.

12 years agoMerge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4
Andrey Hristov [Wed, 19 Dec 2012 14:08:09 +0000 (15:08 +0100)]
Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Remi Collet [Wed, 19 Dec 2012 09:25:05 +0000 (10:25 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix failing test on Linux build

12 years agofix failing test on Linux build
Remi Collet [Wed, 19 Dec 2012 09:23:57 +0000 (10:23 +0100)]
fix failing test on Linux build

12 years agoFix leak when generator ignores sent value
Nikita Popov [Tue, 18 Dec 2012 20:36:48 +0000 (21:36 +0100)]
Fix leak when generator ignores sent value

When the return value of yield wasn't used it was leaked.

This is fixed by using a TMP_VAR return value instead of VAR. TMP_VARs are
automatically freed when they aren't used.

12 years agoNews for PHP 5.5.0 Alphas
David Soria Parra [Fri, 14 Dec 2012 23:08:39 +0000 (00:08 +0100)]
News for PHP 5.5.0 Alphas

12 years agobe cautious about the result of strrchr
Andrey Hristov [Tue, 18 Dec 2012 15:21:05 +0000 (16:21 +0100)]
be cautious about the result of strrchr

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Mon, 17 Dec 2012 06:30:20 +0000 (14:30 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Mon, 17 Dec 2012 06:29:45 +0000 (14:29 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agodos2unix & skip on connect fail
Xinchen Hui [Mon, 17 Dec 2012 06:29:13 +0000 (14:29 +0800)]
dos2unix & skip on connect fail

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Mon, 17 Dec 2012 04:58:12 +0000 (12:58 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Mon, 17 Dec 2012 04:57:37 +0000 (12:57 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoFix failed test
Xinchen Hui [Mon, 17 Dec 2012 04:56:55 +0000 (12:56 +0800)]
Fix failed test

12 years agoIgnore Zend/zend_dtrace_gen.h and Zend/zend_dtrace_gen.hbak
Sebastian Bergmann [Sun, 16 Dec 2012 08:07:55 +0000 (09:07 +0100)]
Ignore Zend/zend_dtrace_gen.h and Zend/zend_dtrace_gen.hbak

12 years agoFixed bug #63706: Cannot build PHP-5.5 with --enable-dtrace on Fedora 17
Remi Collet [Sun, 16 Dec 2012 07:51:17 +0000 (08:51 +0100)]
Fixed bug #63706: Cannot build PHP-5.5 with --enable-dtrace on Fedora 17

12 years agoUpdating news entry to list new filetypes
Lars Strojny [Sat, 15 Dec 2012 11:00:42 +0000 (12:00 +0100)]
Updating news entry to list new filetypes

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Lars Strojny [Fri, 14 Dec 2012 13:56:25 +0000 (14:56 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

12 years agoNews entry for updated mime types
Lars Strojny [Fri, 14 Dec 2012 13:54:38 +0000 (14:54 +0100)]
News entry for updated mime types

12 years agoupdate test for supported Mime Types checking
pascalc [Tue, 11 Dec 2012 15:05:12 +0000 (16:05 +0100)]
update test for supported Mime Types checking

12 years agoupdate list of common Mime Types in PHP development server to support Web audio/video...
pascalc [Tue, 11 Dec 2012 11:45:00 +0000 (12:45 +0100)]
update list of common Mime Types in PHP development server to support Web audio/video formats (Webm ,and Ogg containers) + have jpeg mime types listed together

12 years agoFix warning of no return in non-void function
Xinchen Hui [Fri, 14 Dec 2012 09:26:42 +0000 (17:26 +0800)]
Fix warning of no return in non-void function

12 years agoFixed warning of no return in non-void funciton
Xinchen Hui [Fri, 14 Dec 2012 09:21:43 +0000 (17:21 +0800)]
Fixed warning of no return in non-void funciton

12 years agoAdd test for bug #63741
Xinchen Hui [Fri, 14 Dec 2012 08:52:56 +0000 (16:52 +0800)]
Add test for bug #63741

12 years agoFixed uninitialized EX(call)->called_scope
Dmitry Stogov [Fri, 14 Dec 2012 08:10:29 +0000 (12:10 +0400)]
Fixed uninitialized EX(call)->called_scope

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Rasmus Lerdorf [Fri, 14 Dec 2012 00:54:44 +0000 (16:54 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Rasmus Lerdorf [Fri, 14 Dec 2012 00:54:31 +0000 (16:54 -0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoNeed connect.inc here
Rasmus Lerdorf [Fri, 14 Dec 2012 00:54:16 +0000 (16:54 -0800)]
Need connect.inc here

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Rasmus Lerdorf [Fri, 14 Dec 2012 00:42:50 +0000 (16:42 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Rasmus Lerdorf [Fri, 14 Dec 2012 00:42:33 +0000 (16:42 -0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoFix broken test
Rasmus Lerdorf [Fri, 14 Dec 2012 00:41:56 +0000 (16:41 -0800)]
Fix broken test
Need to use the configured connection parameters here. We can't assume
the test user has access.

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Rasmus Lerdorf [Fri, 14 Dec 2012 00:17:34 +0000 (16:17 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Rasmus Lerdorf [Fri, 14 Dec 2012 00:15:06 +0000 (16:15 -0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoFix broken test
Rasmus Lerdorf [Fri, 14 Dec 2012 00:13:37 +0000 (16:13 -0800)]
Fix broken test
This was missing a %s for the path here

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Arpad Ray [Thu, 13 Dec 2012 23:59:34 +0000 (23:59 +0000)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix #63379 - Don't reset mod_user_is_open in destroy

12 years agoFix #63379 - Don't reset mod_user_is_open in destroy
Arpad Ray [Thu, 13 Dec 2012 23:51:43 +0000 (23:51 +0000)]
Fix #63379 - Don't reset mod_user_is_open in destroy

The parent handler is still open so the reset here was in error.

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Johannes Schlüter [Thu, 13 Dec 2012 21:45:47 +0000 (22:45 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Johannes Schlüter [Thu, 13 Dec 2012 21:40:23 +0000 (22:40 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoFix Bug #63762 Sigsegv when Exception::$trace is changed by user
Johannes Schlüter [Thu, 13 Dec 2012 21:39:35 +0000 (22:39 +0100)]
Fix Bug #63762 Sigsegv when Exception::$trace is changed by user

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Anatoliy Belsky [Thu, 13 Dec 2012 14:05:35 +0000 (15:05 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed mysqlnd compilation in debug mode on windows

12 years agoFixed mysqlnd compilation in debug mode on windows
Anatoliy Belsky [Thu, 13 Dec 2012 14:01:01 +0000 (15:01 +0100)]
Fixed mysqlnd compilation in debug mode on windows

12 years agoRemoved unreachable code
Dmitry Stogov [Thu, 13 Dec 2012 13:51:04 +0000 (17:51 +0400)]
Removed unreachable code

12 years agoRemoved unnecessary checks
Dmitry Stogov [Thu, 13 Dec 2012 13:29:30 +0000 (17:29 +0400)]
Removed unnecessary checks

12 years agoRemoved redundand checks from release build
Dmitry Stogov [Thu, 13 Dec 2012 10:46:44 +0000 (14:46 +0400)]
Removed redundand checks from release build

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Dmitry Stogov [Thu, 13 Dec 2012 09:40:42 +0000 (13:40 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #63757 (getenv() produces memory leak with CGI SAPI)

Conflicts:
NEWS

12 years agoFixed bug #63757 (getenv() produces memory leak with CGI SAPI)
Dmitry Stogov [Thu, 13 Dec 2012 09:39:42 +0000 (13:39 +0400)]
Fixed bug #63757 (getenv() produces memory leak with CGI SAPI)

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Thu, 13 Dec 2012 02:45:33 +0000 (10:45 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Thu, 13 Dec 2012 02:44:56 +0000 (10:44 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoMFH
Xinchen Hui [Thu, 13 Dec 2012 02:44:14 +0000 (10:44 +0800)]
MFH

12 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Dmitry Stogov [Wed, 12 Dec 2012 22:53:27 +0000 (02:53 +0400)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

* 'PHP-5.5' of git.php.net:php-src:
  Really fix test pdo_mysql_class_constants.phpt

12 years agoAn exception thrown in try or catch block is disacarded by return statement in finall...
Dmitry Stogov [Wed, 12 Dec 2012 22:48:51 +0000 (02:48 +0400)]
An exception thrown in try or catch block is disacarded by return statement in finally block.

12 years agoReally fix test pdo_mysql_class_constants.phpt
Remi Collet [Wed, 12 Dec 2012 15:53:18 +0000 (16:53 +0100)]
Really fix test pdo_mysql_class_constants.phpt

- with mysqlnd, constant always present
- with mysqli, check client library version
- without mysqlnd and without mysqli
skip the test if no connection
use connection to check client library

Note : MySQLPDOTest::getClientVersion() is broken with mysqlnd
as PDO::ATTR_CLIENT_VERSION return "mysqlnd 5.0.11-dev - 20120503..."
so, getClientVersion() return "11"

12 years agoRestored proper generators behaviour in conjunction with "finally". (Nikita)
Dmitry Stogov [Wed, 12 Dec 2012 13:47:55 +0000 (17:47 +0400)]
Restored proper generators behaviour in conjunction with "finally". (Nikita)

12 years agoFixed Bug #63738 unpack: back result with Z format
Remi Collet [Tue, 11 Dec 2012 15:30:08 +0000 (16:30 +0100)]
Fixed Bug #63738 unpack: back result with Z format

Fix result for empty string.
Same output as perl
perl -e 'print unpack("Z2","\0\0");' => ""
perl -e 'print unpack("Z2","A\0");'  => "A"
perl -e 'print unpack("Z2","AB\0");' => "AB"
perl -e 'print unpack("Z2","ABC\0");'=> "AB"

12 years ago- generators API exported for extensions
Dmitry Stogov [Tue, 11 Dec 2012 13:25:32 +0000 (17:25 +0400)]
- generators API exported for extensions
- improved RETURN sequence to avoid redundant check if op_array is a generator

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Adam Harvey [Tue, 11 Dec 2012 11:53:02 +0000 (19:53 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Alter php_json_decode_ex() to respect JSON_BIGINT_AS_STRING for bare numbers.

12 years agoAlter php_json_decode_ex() to respect JSON_BIGINT_AS_STRING for bare numbers.
Adam Harvey [Tue, 11 Dec 2012 11:51:30 +0000 (19:51 +0800)]
Alter php_json_decode_ex() to respect JSON_BIGINT_AS_STRING for bare numbers.

Fixes bug #63737 (json_decode does not properly decode with options parameter).

12 years agoTinker with the wording of the MySQL deprecation news post.
Adam Harvey [Tue, 11 Dec 2012 01:08:07 +0000 (09:08 +0800)]
Tinker with the wording of the MySQL deprecation news post.

I know that in general NEWS is a very punchy "this is what happened" log, but
Chris e-mailed me off-list to ask if it could be added to avoid any FUD — this
merely brings the NEWS post into line with UPGRADING, the migration guide, and
every other piece of advice we're giving out.

I also forgot to add the RFC URL last night, so added that.

12 years agoDeprecate ext/mysql.
Adam Harvey [Mon, 10 Dec 2012 14:12:09 +0000 (22:12 +0800)]
Deprecate ext/mysql.

Per https://wiki.php.net/rfc/mysql_deprecation, connecting to a MySQL database
via ext/mysql now generates an E_DEPRECATED error. This commit includes the
minimal EXPECTF updates required for the test suite to pass: it may be
preferable to refactor some of the tests to suppress deprecation errors in
situations where no other error is expected from mysql_[p]connect(), but I'm
not enough of a MySQL expert to want to get my hands that dirty in a long
standing test suite.

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Johannes Schlüter [Mon, 10 Dec 2012 12:36:05 +0000 (13:36 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Johannes Schlüter [Mon, 10 Dec 2012 12:35:57 +0000 (13:35 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoMerge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3
Johannes Schlüter [Mon, 10 Dec 2012 12:35:27 +0000 (13:35 +0100)]
Merge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Johannes Schlüter [Mon, 10 Dec 2012 12:34:23 +0000 (13:34 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Johannes Schlüter [Mon, 10 Dec 2012 12:32:50 +0000 (13:32 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoFix typo
Johannes Schlüter [Mon, 10 Dec 2012 12:32:08 +0000 (13:32 +0100)]
Fix typo

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Mon, 10 Dec 2012 12:30:39 +0000 (20:30 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

12 years agoFixed bug #63726 (Memleak with static properties and internal/user classes)
Xinchen Hui [Mon, 10 Dec 2012 12:29:51 +0000 (20:29 +0800)]
Fixed bug #63726 (Memleak with static properties and internal/user classes)

No test scripts provided (will try to find one)

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Mon, 10 Dec 2012 12:29:38 +0000 (20:29 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoFixed bug #63726 (Memleak with static properties and internal/user classes)
Xinchen Hui [Mon, 10 Dec 2012 12:28:27 +0000 (20:28 +0800)]
Fixed bug #63726 (Memleak with static properties and internal/user classes)

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Mon, 10 Dec 2012 10:47:53 +0000 (18:47 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoskip 32-bit OS
Xinchen Hui [Mon, 10 Dec 2012 10:47:21 +0000 (18:47 +0800)]
skip 32-bit OS

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Mon, 10 Dec 2012 10:35:04 +0000 (18:35 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Mon, 10 Dec 2012 10:29:34 +0000 (18:29 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoMerge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3
Xinchen Hui [Mon, 10 Dec 2012 10:28:26 +0000 (18:28 +0800)]
Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3

12 years agoNeed more that 2G memory
Xinchen Hui [Mon, 10 Dec 2012 10:28:01 +0000 (18:28 +0800)]
Need more that 2G memory

12 years agoCleanup NEWS
Sebastian Bergmann [Thu, 6 Dec 2012 10:03:37 +0000 (11:03 +0100)]
Cleanup NEWS

12 years agoGeneratirs are going to be used less than regular functions
Dmitry Stogov [Thu, 6 Dec 2012 09:14:31 +0000 (13:14 +0400)]
Generatirs are going to be used less than regular functions

12 years agoLeftover: Invoke re2c with --no-generation-date to prevent unintentional / unnecessar...
Sebastian Bergmann [Thu, 6 Dec 2012 08:43:27 +0000 (09:43 +0100)]
Leftover: Invoke re2c with --no-generation-date to prevent unintentional / unnecessary changes in generated files.

12 years agoInvoke re2c with --no-generation-date to prevent unintentional / unnecessary changes...
Sebastian Bergmann [Thu, 6 Dec 2012 08:28:35 +0000 (09:28 +0100)]
Invoke re2c with --no-generation-date to prevent unintentional / unnecessary changes in generated files.

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Johannes Schlüter [Wed, 5 Dec 2012 18:03:04 +0000 (19:03 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Johannes Schlüter [Wed, 5 Dec 2012 18:02:41 +0000 (19:02 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4

Conflicts:
configure.in
main/php_version.h

12 years agothis will become PHP 5.3.21
Johannes Schlüter [Wed, 5 Dec 2012 17:55:05 +0000 (18:55 +0100)]
this will become PHP 5.3.21

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Dmitry Stogov [Wed, 5 Dec 2012 13:59:46 +0000 (17:59 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Use get_gc instead of hacks of get_properties

12 years agoUse get_gc instead of hacks of get_properties
Dmitry Stogov [Wed, 5 Dec 2012 13:58:36 +0000 (17:58 +0400)]
Use get_gc instead of hacks of get_properties

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Dmitry Stogov [Wed, 5 Dec 2012 13:55:21 +0000 (17:55 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #63680 (Memleak in splfixedarray with cycle reference)

Conflicts:
NEWS

12 years agoFixed bug #63680 (Memleak in splfixedarray with cycle reference)
Dmitry Stogov [Wed, 5 Dec 2012 13:53:26 +0000 (17:53 +0400)]
Fixed bug #63680 (Memleak in splfixedarray with cycle reference)

12 years agoFixed comments
Dmitry Stogov [Wed, 5 Dec 2012 12:02:47 +0000 (16:02 +0400)]
Fixed comments

12 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Dmitry Stogov [Wed, 5 Dec 2012 09:37:40 +0000 (13:37 +0400)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

* 'PHP-5.5' of git.php.net:php-src:
  Two tests deactivated until #63688 was fixed

12 years agoSlight performance improvement
Dmitry Stogov [Wed, 5 Dec 2012 09:23:37 +0000 (13:23 +0400)]
Slight performance improvement

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Anatoliy Belsky [Wed, 5 Dec 2012 08:58:04 +0000 (09:58 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Two tests deactivated until #63688 was fixed

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatoliy Belsky [Wed, 5 Dec 2012 08:57:36 +0000 (09:57 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Two tests deactivated until #63688 was fixed