granicus.if.org Git

Dmitry Stogov [Tue, 20 Nov 2012 08:58:16 +0000 (12:58 +0400)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed bug #63468 (wrong called method as callback with inheritance)

Conflicts:
NEWS

commit | commitdiff | tree

Dmitry Stogov [Tue, 20 Nov 2012 08:54:40 +0000 (12:54 +0400)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Fixed bug #63468 (wrong called method as callback with inheritance)

Conflicts:
NEWS

commit | commitdiff | tree

Dmitry Stogov [Tue, 20 Nov 2012 08:51:55 +0000 (12:51 +0400)]

Fixed bug #63468 (wrong called method as callback with inheritance)

commit | commitdiff | tree

Christopher Jones [Sun, 18 Nov 2012 22:44:00 +0000 (14:44 -0800)]

Merge branch 'add_ver_to_upgrading' into PHP-5.5

* add_ver_to_upgrading:
Add actual branch version number to UPGRADING

commit | commitdiff | tree

Christopher Jones [Sun, 18 Nov 2012 22:43:26 +0000 (14:43 -0800)]

Add actual branch version number to UPGRADING

commit | commitdiff | tree

Christopher Jones [Sun, 18 Nov 2012 22:20:57 +0000 (14:20 -0800)]

Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Put the new php.ini directives together.
  Move the deprecated functions up to the Deprecated Functionality section so they're more visible.
  Regenerate Zend ini scanner
  Fixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from value

commit | commitdiff | tree

Christopher Jones [Sun, 18 Nov 2012 22:20:53 +0000 (14:20 -0800)]

Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

* 'PHP-5.4' of https://git.php.net/repository/php-src:
Regenerate Zend ini scanner
Fixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from value

commit | commitdiff | tree

Christopher Jones [Sun, 18 Nov 2012 22:20:49 +0000 (14:20 -0800)]

Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3

* 'PHP-5.3' of https://git.php.net/repository/php-src:
Regenerate Zend ini scanner
Fixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from value

commit | commitdiff | tree

Adam Harvey [Fri, 16 Nov 2012 04:34:10 +0000 (04:34 +0000)]

Put the new php.ini directives together.

(And make colon usage more consistent.)

commit | commitdiff | tree

Adam Harvey [Fri, 16 Nov 2012 04:33:17 +0000 (04:33 +0000)]

Move the deprecated functions up to the Deprecated Functionality section so
they're more visible.

commit | commitdiff | tree

Pierrick Charron [Fri, 16 Nov 2012 23:28:04 +0000 (18:28 -0500)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Regenerate Zend ini scanner

Conflicts:
Zend/zend_ini_scanner.c
Zend/zend_ini_scanner_defs.h

commit | commitdiff | tree

Pierrick Charron [Fri, 16 Nov 2012 23:24:42 +0000 (18:24 -0500)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Regenerate Zend ini scanner

Conflicts:
Zend/zend_ini_scanner.c
Zend/zend_ini_scanner_defs.h

commit | commitdiff | tree

Pierrick Charron [Fri, 16 Nov 2012 23:16:21 +0000 (18:16 -0500)]

Regenerate Zend ini scanner

Regenerate both zend_ini_scanner.c and zend_ini_scanner_defs.h

commit | commitdiff | tree

Pierrick Charron [Fri, 16 Nov 2012 23:08:19 +0000 (18:08 -0500)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from value

commit | commitdiff | tree

Pierrick Charron [Fri, 16 Nov 2012 23:07:02 +0000 (18:07 -0500)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Fixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from value

commit | commitdiff | tree

Pierrick Charron [Fri, 16 Nov 2012 23:04:14 +0000 (18:04 -0500)]

Fixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from value

Restore the old behavior but keep bug 51094 fixed

commit | commitdiff | tree

Christopher Jones [Fri, 16 Nov 2012 03:29:53 +0000 (19:29 -0800)]

Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Fixed ext/intl/tests/timezone_createDefault_basic.phpt
  Skip test if directory does not exist
  Fixed ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt
  Fixed test sapi/cli/tests/006.phpt
  Fixed compiler reenterability
  Fixed compiler reenterability
  Updated NEWS
  UPdated NEWS
  Updated NEWS

commit | commitdiff | tree

Christopher Jones [Fri, 16 Nov 2012 03:29:48 +0000 (19:29 -0800)]

Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Skip test if directory does not exist
  Fixed test sapi/cli/tests/006.phpt
  Fixed compiler reenterability
  Fixed compiler reenterability
  UPdated NEWS
  Updated NEWS

commit | commitdiff | tree

Christopher Jones [Fri, 16 Nov 2012 03:29:44 +0000 (19:29 -0800)]

Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3

* 'PHP-5.3' of https://git.php.net/repository/php-src:
Skip test if directory does not exist
Updated NEWS

commit | commitdiff | tree

Anatoliy Belsky [Thu, 15 Nov 2012 13:31:55 +0000 (14:31 +0100)]

Fixed ext/intl/tests/timezone_createDefault_basic.phpt

Timezone offsets can be negative

commit | commitdiff | tree

Johannes Schlüter [Thu, 15 Nov 2012 11:29:58 +0000 (12:29 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Johannes Schlüter [Thu, 15 Nov 2012 11:29:38 +0000 (12:29 +0100)]

Merge branch 'PHP-5.3' into PHP-5.4

commit | commitdiff | tree

Johannes Schlüter [Thu, 15 Nov 2012 11:28:19 +0000 (12:28 +0100)]

Skip test if directory does not exist

Would be good to run this using a directory which is existing
everywhere.

commit | commitdiff | tree

Anatoliy Belsky [Wed, 14 Nov 2012 20:18:16 +0000 (21:18 +0100)]

Fixed ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt

There is a constant now which only is there when mysqli with
mysqlnd and pdo_mysql was compiled at the same time, or when
libmysql version > 50605. So checking for that dynamically,
will fail only if there is no mysqli and no connection.

commit | commitdiff | tree

Anatoliy Belsky [Wed, 14 Nov 2012 15:23:36 +0000 (16:23 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed test sapi/cli/tests/006.phpt

commit | commitdiff | tree

Anatoliy Belsky [Wed, 14 Nov 2012 15:20:59 +0000 (16:20 +0100)]

Fixed test sapi/cli/tests/006.phpt

Third param in preg_match_all() is optional for a while )

commit | commitdiff | tree

Dmitry Stogov [Wed, 14 Nov 2012 14:03:38 +0000 (18:03 +0400)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed compiler reenterability
Fixed compiler reenterability

Conflicts:
Zend/zend_language_scanner.c
Zend/zend_language_scanner_defs.h

commit | commitdiff | tree

Dmitry Stogov [Wed, 14 Nov 2012 13:47:27 +0000 (17:47 +0400)]

Fixed compiler reenterability

commit | commitdiff | tree

Dmitry Stogov [Wed, 14 Nov 2012 13:45:10 +0000 (17:45 +0400)]

Fixed compiler reenterability

commit | commitdiff | tree

Anatoliy Belsky [Wed, 14 Nov 2012 09:15:42 +0000 (10:15 +0100)]

commit | commitdiff | tree

Anatoliy Belsky [Wed, 14 Nov 2012 09:07:55 +0000 (10:07 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
UPdated NEWS
Updated NEWS

commit | commitdiff | tree

Anatoliy Belsky [Wed, 14 Nov 2012 09:06:46 +0000 (10:06 +0100)]

commit | commitdiff | tree

Anatoliy Belsky [Wed, 14 Nov 2012 09:04:27 +0000 (10:04 +0100)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Updated NEWS

commit | commitdiff | tree

Anatoliy Belsky [Wed, 14 Nov 2012 09:02:35 +0000 (10:02 +0100)]

commit | commitdiff | tree

David Soria Parra [Tue, 13 Nov 2012 19:56:17 +0000 (20:56 +0100)]

commit | commitdiff | tree

Anatoliy Belsky [Tue, 13 Nov 2012 18:48:34 +0000 (19:48 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Enabled apache 2.4 handler build option

commit | commitdiff | tree

Anatoliy Belsky [Tue, 13 Nov 2012 18:40:22 +0000 (19:40 +0100)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Enabled apache 2.4 handler build option

Conflicts:
sapi/apache2handler/config.w32

commit | commitdiff | tree

Pierre Joye [Tue, 13 Nov 2012 18:34:00 +0000 (19:34 +0100)]

Enabled apache 2.4 handler build option

commit | commitdiff | tree

David Soria Parra [Mon, 12 Nov 2012 16:47:15 +0000 (17:47 +0100)]

Build .xz archive during makedist

commit | commitdiff | tree

David Soria Parra [Mon, 12 Nov 2012 13:29:32 +0000 (14:29 +0100)]

NEWS: remove dots at the end of the NEWS file

commit | commitdiff | tree

David Soria Parra [Mon, 12 Nov 2012 12:45:30 +0000 (13:45 +0100)]

commit | commitdiff | tree

David Soria Parra [Mon, 12 Nov 2012 12:45:15 +0000 (13:45 +0100)]

Add missing parts from UPGRADING to NEWS

commit | commitdiff | tree

Anatoliy Belsky [Tue, 13 Nov 2012 13:53:32 +0000 (14:53 +0100)]

Fixed sockets ext build on win

commit | commitdiff | tree

Derick Rethans [Tue, 13 Nov 2012 10:17:21 +0000 (10:17 +0000)]

Merge branch 'PHP-5.4'

commit | commitdiff | tree

Derick Rethans [Tue, 13 Nov 2012 10:16:58 +0000 (10:16 +0000)]

Merge branch 'PHP-5.3' into PHP-5.4

Conflicts:
NEWS

commit | commitdiff | tree

Derick Rethans [Tue, 13 Nov 2012 10:15:34 +0000 (10:15 +0000)]

- Updated to version 2012.10 (2012j)

commit | commitdiff | tree

Derick Rethans [Tue, 13 Nov 2012 10:10:41 +0000 (10:10 +0000)]

Merge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3

commit | commitdiff | tree

Derick Rethans [Tue, 13 Nov 2012 10:10:28 +0000 (10:10 +0000)]

Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4

commit | commitdiff | tree

Derick Rethans [Tue, 13 Nov 2012 10:10:10 +0000 (10:10 +0000)]

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

commit | commitdiff | tree

Gustavo Lopes [Mon, 12 Nov 2012 18:16:12 +0000 (19:16 +0100)]

List ext/intl changes also in NEWS

commit | commitdiff | tree

Adam Harvey [Mon, 12 Nov 2012 12:09:18 +0000 (20:09 +0800)]

Merge branch 'PHP-5.4'

* PHP-5.4:
Update arginfo for preg_match_all() to reflect reality.
fix invalid read when trimming empty string

commit | commitdiff | tree

Adam Harvey [Mon, 12 Nov 2012 12:08:01 +0000 (20:08 +0800)]

Merge branch 'preg_match_all_arginfo' into PHP-5.4

* preg_match_all_arginfo:
Update arginfo for preg_match_all() to reflect reality.

commit | commitdiff | tree

Adam Harvey [Mon, 12 Nov 2012 12:04:26 +0000 (20:04 +0800)]

Update arginfo for preg_match_all() to reflect reality.

Back when I implemented FR #53238 during the 5.4 development phase to make the
$matches parameter optional in preg_match_all(), it turns out I forgot to
update the arginfo to note that only 2 parameters are now required by
preg_match_all(). The function itself works fine, but reflection was reporting
the wrong number of required parameters.

commit | commitdiff | tree

Bernhard K. Weisshuhn [Sun, 11 Nov 2012 19:11:06 +0000 (20:11 +0100)]

make failed tests fail the test target

I don't see any reason to ignore failed tests. This makes it
unnecessarily difficult to use ci, also for module builds.

commit | commitdiff | tree

Antony Dovgal [Sun, 11 Nov 2012 18:37:04 +0000 (22:37 +0400)]

fix invalid read when trimming empty string

commit | commitdiff | tree

Antony Dovgal [Sun, 11 Nov 2012 18:37:04 +0000 (22:37 +0400)]

fix invalid read when trimming empty string

commit | commitdiff | tree

Antony Dovgal [Sun, 11 Nov 2012 18:37:04 +0000 (22:37 +0400)]

fix invalid read when trimming empty string

Merge branch 'PHP-5.4'

* PHP-5.4:
- Fixed bug #63451 (config.guess file does not have AIX 7 defined, shared objects are not created)

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
- Fixed bug #63451 (config.guess file does not have AIX 7 defined, shared objects are not created)

- Fixed bug #63451 (config.guess file does not have AIX 7 defined, shared objects are not created)

commit | commitdiff | tree

Johannes Schlüter [Wed, 7 Nov 2012 23:04:08 +0000 (00:04 +0100)]

Merge branch 'PHP-5.4'

commit | commitdiff | tree

Johannes Schlüter [Wed, 7 Nov 2012 23:03:37 +0000 (00:03 +0100)]

Merge branch 'PHP-5.3' into PHP-5.4

Conflicts:
configure.in
main/php_version.h

commit | commitdiff | tree

Johannes Schlüter [Wed, 7 Nov 2012 23:01:43 +0000 (00:01 +0100)]

This will be PHP 5.3.20

commit | commitdiff | tree

Stanislav Malyshev [Wed, 7 Nov 2012 09:19:20 +0000 (01:19 -0800)]

Merge branch 'PHP-5.4'

* PHP-5.4:
fix NEWS

commit | commitdiff | tree

Stanislav Malyshev [Wed, 7 Nov 2012 09:18:34 +0000 (01:18 -0800)]

Merge branch 'PHP-5.4'

Merge branch 'PHP-5.3' into PHP-5.4

Fixed bug #63447 (max_input_vars doesn't filter variables when mbstring.encoding_translation = On)

Merge branch 'PHP-5.3' into PHP-5.4

commit | commitdiff | tree

Rasmus Lerdorf [Tue, 6 Nov 2012 05:06:18 +0000 (21:06 -0800)]

News entry for png memleak fix

commit | commitdiff | tree

Rasmus Lerdorf [Tue, 6 Nov 2012 05:04:33 +0000 (21:04 -0800)]

News entry for png memleak fix

commit | commitdiff | tree

Rasmus Lerdorf [Tue, 6 Nov 2012 04:58:04 +0000 (20:58 -0800)]

Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3

commit | commitdiff | tree

Rasmus Lerdorf [Tue, 6 Nov 2012 04:56:19 +0000 (20:56 -0800)]

These need to be volatile in order to prevent leaking after the
longjmp in the error handler

commit | commitdiff | tree

Rasmus Lerdorf [Tue, 6 Nov 2012 04:56:19 +0000 (20:56 -0800)]

These need to be volatile in order to prevent leaking after the
longjmp in the error handler

commit | commitdiff | tree

Rasmus Lerdorf [Tue, 6 Nov 2012 04:56:19 +0000 (20:56 -0800)]

These need to be volatile in order to prevent leaking after the
longjmp in the error handler

commit | commitdiff | tree

Derick Rethans [Sun, 4 Nov 2012 16:24:07 +0000 (16:24 +0000)]

Merge branch 'PHP-5.4'

commit | commitdiff | tree

Derick Rethans [Sun, 4 Nov 2012 16:24:02 +0000 (16:24 +0000)]

Merge branch 'PHP-5.3' into PHP-5.4

commit | commitdiff | tree

Derick Rethans [Sun, 4 Nov 2012 16:23:58 +0000 (16:23 +0000)]

- Updated to version 2012.9 (2012i)

Fixed bug #63428 (The behavior of execute() changed)

The /e modifier is deprecated

Merge branch 'PHP-5.4'

Merge branch 'PHP-5.3' into PHP-5.4

Fixed bug #62444 (Handle leak in is_readable on windows).

commit | commitdiff | tree

Anatoliy Belsky [Wed, 31 Oct 2012 22:01:09 +0000 (23:01 +0100)]

Merge branch 'PHP-5.4'

* PHP-5.4:
Fixed bug #63241 PHP fails to open Windows deduplicated files.

Conflicts:
NEWS

commit | commitdiff | tree

Anatoliy Belsky [Wed, 31 Oct 2012 21:55:32 +0000 (22:55 +0100)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Fixed bug #63241 PHP fails to open Windows deduplicated files.

commit | commitdiff | tree

Anatoliy Belsky [Wed, 31 Oct 2012 21:41:03 +0000 (22:41 +0100)]

Fixed bug #63241 PHP fails to open Windows deduplicated files.

Fix by (daniel dot stelter-gliese at innogames dot de).
No test is supplied because the issue addresses
the new feature of the Windows Server 2012 and
would need a very specific filesystem setup.

commit | commitdiff | tree

Andrey Hristov [Wed, 31 Oct 2012 18:04:10 +0000 (19:04 +0100)]

Merge branch 'PHP-5.4'

commit | commitdiff | tree

Andrey Hristov [Wed, 31 Oct 2012 17:29:31 +0000 (18:29 +0100)]

Merge branch 'PHP-5.3' into PHP-5.4

commit | commitdiff | tree

Andrey Hristov [Wed, 31 Oct 2012 17:26:09 +0000 (18:26 +0100)]

read 1 instead of 2 bytes. The next 2 bytes are 2 and thus not a problem

commit | commitdiff | tree

Johannes Schlüter [Wed, 31 Oct 2012 15:54:11 +0000 (16:54 +0100)]

Allow setting SHA256 auth public key as option

commit | commitdiff | tree

Andrey Hristov [Wed, 31 Oct 2012 15:13:00 +0000 (16:13 +0100)]

commit | commitdiff | tree

Andrey Hristov [Wed, 31 Oct 2012 14:55:04 +0000 (15:55 +0100)]

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

commit | commitdiff | tree

Andrey Hristov [Wed, 31 Oct 2012 14:54:45 +0000 (15:54 +0100)]

commit | commitdiff | tree

Xinchen Hui [Wed, 31 Oct 2012 03:14:53 +0000 (11:14 +0800)]

Merge branch 'PHP-5.4'

commit | commitdiff | tree

Xinchen Hui [Wed, 31 Oct 2012 03:13:32 +0000 (11:13 +0800)]

Fixed bug #63399 (ReflectionClass::getTraitAliases() incorrectly resolves traitnames)

commit | commitdiff | tree

David Soria Parra [Tue, 30 Oct 2012 14:43:56 +0000 (15:43 +0100)]

Merge branch 'PHP-5.4'

* PHP-5.4:
  NEWS for bug #62593
  Bug #62593 Updated to account for INOUT parameters
  Bug #62593 Updated test to verify bindParam doesn't change original value
  Bug #62593 Updated to always treat zval by value
  Bug #62593 Added test for change
  Bug #62593 Updated pdo_pgsql driver to convert boolean values to pg native format in emulation mode

commit | commitdiff | tree

David Soria Parra [Tue, 30 Oct 2012 14:43:32 +0000 (15:43 +0100)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  NEWS for bug #62593
  Bug #62593 Updated to account for INOUT parameters
  Bug #62593 Updated test to verify bindParam doesn't change original value
  Bug #62593 Updated to always treat zval by value
  Bug #62593 Added test for change
  Bug #62593 Updated pdo_pgsql driver to convert boolean values to pg native format in emulation mode

commit | commitdiff | tree

David Soria Parra [Tue, 30 Oct 2012 14:26:39 +0000 (15:26 +0100)]