]> granicus.if.org Git - php/log
php
12 years agoFixed bug #63588 Duplicate implementation of php_next_utf8_char
Remi Collet [Sun, 25 Nov 2012 07:14:23 +0000 (08:14 +0100)]
Fixed bug #63588 Duplicate implementation of php_next_utf8_char

Json use an utf8 parser from a third party library, switch to
our implementation of php_next_utf8_char.
This also helps on solving #63520. All the unit tests succeed.
Our implementation also seems a little faster.

json.dsp need to be regenerated.

12 years agoFixed Bug #63361 Header not installed
Remi Collet [Sun, 25 Nov 2012 06:46:02 +0000 (07:46 +0100)]
Fixed Bug #63361 Header not installed

ext/mysqli/php_mysqli_structs.h is installed and includes
mysqli_mysqlnd.h or mysqli_libmysql.h. So this header must also
be installed.

12 years agoNEWS entries
Remi Collet [Sun, 25 Nov 2012 06:40:39 +0000 (07:40 +0100)]
NEWS entries

12 years agofix NEWS
Stanislav Malyshev [Sun, 25 Nov 2012 00:28:56 +0000 (16:28 -0800)]
fix NEWS

12 years ago5.4.10-dev
Stanislav Malyshev [Sat, 10 Nov 2012 08:07:44 +0000 (00:07 -0800)]
5.4.10-dev

12 years agoFixed Bug #63149 Feature missing with system SQLite
Remi Collet [Sat, 24 Nov 2012 16:47:51 +0000 (17:47 +0100)]
Fixed Bug #63149 Feature missing with system SQLite

In pdo_sqlite, getColumnMeta should return the table name.
With bundled SQLite library, -DSQLITE_ENABLE_COLUMN_METADATA=1 (other_flags)
enable the feature in SQLite (function sqlite3_column_table_name).
With system SQLite library, this fix detects if sqlite3_column_table_name is
available and add SQLITE_ENABLE_COLUMN_METADATA macro to get the same behavior.

Test already exists: ext/pdo_sqlite/tests/bug_42589.phpt

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Remi Collet [Sat, 24 Nov 2012 16:31:18 +0000 (17:31 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  add unit test for bug 63126
  NEWS

12 years agoadd unit test for bug 63126
Remi Collet [Sat, 24 Nov 2012 16:30:48 +0000 (17:30 +0100)]
add unit test for bug 63126

12 years agoNEWS
Remi Collet [Sat, 24 Nov 2012 14:23:25 +0000 (15:23 +0100)]
NEWS

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Remi Collet [Sat, 24 Nov 2012 14:01:24 +0000 (15:01 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed Bug #63126 DISABLE_AUTHENTICATOR ignores array

12 years agoFixed Bug #63126 DISABLE_AUTHENTICATOR ignores array
Remi Collet [Sat, 24 Nov 2012 14:00:03 +0000 (15:00 +0100)]
Fixed Bug #63126 DISABLE_AUTHENTICATOR ignores array

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatoliy Belsky [Fri, 23 Nov 2012 13:00:30 +0000 (14:00 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Backported the fix for bug #63248 from 5.4+

12 years agoBackported the fix for bug #63248 from 5.4+
Anatoliy Belsky [Fri, 23 Nov 2012 12:58:22 +0000 (13:58 +0100)]
Backported the fix for bug #63248 from 5.4+

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatoliy Belsky [Thu, 22 Nov 2012 18:04:49 +0000 (19:04 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed test for bug #63297

12 years agoFixed test for bug #63297
Anatoliy Belsky [Thu, 22 Nov 2012 18:01:09 +0000 (19:01 +0100)]
Fixed test for bug #63297

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Johannes Schlüter [Wed, 21 Nov 2012 20:09:57 +0000 (21:09 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoPHP 5.3.19
Johannes Schlüter [Wed, 21 Nov 2012 20:09:25 +0000 (21:09 +0100)]
PHP 5.3.19

12 years agoUnused variable copystr
Xinchen Hui [Wed, 21 Nov 2012 04:30:03 +0000 (12:30 +0800)]
Unused variable copystr

copystr is declared again blow

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
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

12 years agoFixed bug #63468 (wrong called method as callback with inheritance)
Dmitry Stogov [Tue, 20 Nov 2012 08:51:55 +0000 (12:51 +0400)]
Fixed bug #63468 (wrong called method as callback with inheritance)

12 years agoMerge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
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

12 years agoMerge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3
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

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
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

12 years agoRegenerate Zend ini scanner
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

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
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

12 years agoFixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from value
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

12 years agoMerge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
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

12 years agoMerge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3
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

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Johannes Schlüter [Thu, 15 Nov 2012 11:29:38 +0000 (12:29 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoSkip test if directory does not exist
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.

12 years agoFixed test sapi/cli/tests/006.phpt
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 )

12 years agoFixed compiler reenterability
Dmitry Stogov [Wed, 14 Nov 2012 13:47:27 +0000 (17:47 +0400)]
Fixed compiler reenterability

12 years agoFixed compiler reenterability
Dmitry Stogov [Wed, 14 Nov 2012 13:45:10 +0000 (17:45 +0400)]
Fixed compiler reenterability

12 years agoUPdated NEWS
Anatoliy Belsky [Wed, 14 Nov 2012 09:06:46 +0000 (10:06 +0100)]
UPdated NEWS

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
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

12 years agoUpdated NEWS
Anatoliy Belsky [Wed, 14 Nov 2012 09:02:35 +0000 (10:02 +0100)]
Updated NEWS

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
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

12 years agoEnabled apache 2.4 handler build option
Pierre Joye [Tue, 13 Nov 2012 18:34:00 +0000 (19:34 +0100)]
Enabled apache 2.4 handler build option

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Derick Rethans [Tue, 13 Nov 2012 10:16:58 +0000 (10:16 +0000)]
Merge branch 'PHP-5.3' into PHP-5.4

Conflicts:
NEWS

12 years ago- Updated to version 2012.10 (2012j)
Derick Rethans [Tue, 13 Nov 2012 10:15:34 +0000 (10:15 +0000)]
- Updated to version 2012.10 (2012j)

12 years agoMerge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3
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

12 years agoMerge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
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

12 years agoMerge branch 'preg_match_all_arginfo' into PHP-5.4
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.

12 years agoUpdate arginfo for preg_match_all() to reflect reality.
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.

12 years agofix invalid read when trimming empty string
Antony Dovgal [Sun, 11 Nov 2012 18:37:04 +0000 (22:37 +0400)]
fix invalid read when trimming empty string

12 years agofix invalid read when trimming empty string
Antony Dovgal [Sun, 11 Nov 2012 18:37:04 +0000 (22:37 +0400)]
fix invalid read when trimming empty string

12 years ago- BFN
Felipe Pena [Fri, 9 Nov 2012 23:28:30 +0000 (21:28 -0200)]
- BFN

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Felipe Pena [Fri, 9 Nov 2012 23:23:10 +0000 (21:23 -0200)]
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)

12 years ago- Fixed bug #63451 (config.guess file does not have AIX 7 defined, shared objects...
Felipe Pena [Fri, 9 Nov 2012 23:22:27 +0000 (21:22 -0200)]
- Fixed bug #63451 (config.guess file does not have AIX 7 defined, shared objects are not created)

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
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

12 years agoThis will be PHP 5.3.20
Johannes Schlüter [Wed, 7 Nov 2012 23:01:43 +0000 (00:01 +0100)]
This will be PHP 5.3.20

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

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Wed, 7 Nov 2012 09:08:34 +0000 (17:08 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoFixed bug #63447 (max_input_vars doesn't filter variables when mbstring.encoding_tran...
Xinchen Hui [Wed, 7 Nov 2012 09:05:24 +0000 (17:05 +0800)]
Fixed bug #63447 (max_input_vars doesn't filter variables when mbstring.encoding_translation = On)

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Tue, 6 Nov 2012 06:14:55 +0000 (14:14 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoNews entry for png memleak fix
Rasmus Lerdorf [Tue, 6 Nov 2012 05:06:18 +0000 (21:06 -0800)]
News entry for png memleak fix

12 years agoNews entry for png memleak fix
Rasmus Lerdorf [Tue, 6 Nov 2012 05:04:33 +0000 (21:04 -0800)]
News entry for png memleak fix

12 years agoMerge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3
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

12 years agoThese need to be volatile in order to prevent leaking after the
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

12 years agoThese need to be volatile in order to prevent leaking after the
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

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Derick Rethans [Sun, 4 Nov 2012 16:24:02 +0000 (16:24 +0000)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years ago- Updated to version 2012.9 (2012i)
Derick Rethans [Sun, 4 Nov 2012 16:23:58 +0000 (16:23 +0000)]
- Updated to version 2012.9 (2012i)

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Fri, 2 Nov 2012 10:54:27 +0000 (18:54 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoFixed bug #62444 (Handle leak in is_readable on windows).
Xinchen Hui [Fri, 2 Nov 2012 10:52:12 +0000 (18:52 +0800)]
Fixed bug #62444 (Handle leak in is_readable on windows).

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
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.

12 years agoFixed bug #63241 PHP fails to open Windows deduplicated files.
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.

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Andrey Hristov [Wed, 31 Oct 2012 17:29:31 +0000 (18:29 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoread 1 instead of 2 bytes. The next 2 bytes are 2 and thus not a problem
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

12 years agoFixed bug #63399 (ReflectionClass::getTraitAliases() incorrectly resolves traitnames)
Xinchen Hui [Wed, 31 Oct 2012 03:13:32 +0000 (11:13 +0800)]
Fixed bug #63399 (ReflectionClass::getTraitAliases() incorrectly resolves traitnames)

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
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

12 years agoNEWS for bug #62593
David Soria Parra [Tue, 30 Oct 2012 14:26:39 +0000 (15:26 +0100)]
NEWS for bug #62593

12 years agoBug #62593 Updated to account for INOUT parameters
Will Fitch [Wed, 26 Sep 2012 16:00:17 +0000 (12:00 -0400)]
Bug #62593 Updated to account for INOUT parameters

12 years agoBug #62593 Updated test to verify bindParam doesn't change original value
Will Fitch [Tue, 25 Sep 2012 19:22:24 +0000 (15:22 -0400)]
Bug #62593 Updated test to verify bindParam doesn't change original value

12 years agoBug #62593 Updated to always treat zval by value
Will Fitch [Tue, 25 Sep 2012 19:18:12 +0000 (15:18 -0400)]
Bug #62593 Updated to always treat zval by value

12 years agoBug #62593 Added test for change
Will Fitch [Mon, 24 Sep 2012 17:31:20 +0000 (13:31 -0400)]
Bug #62593 Added test for change

12 years agoBug #62593 Updated pdo_pgsql driver to convert boolean values to pg native format...
Will Fitch [Thu, 20 Sep 2012 16:32:53 +0000 (12:32 -0400)]
Bug #62593 Updated pdo_pgsql driver to convert boolean values to pg native format in emulation mode

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Tue, 30 Oct 2012 03:09:53 +0000 (11:09 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoFixed bug #63389 (Missing context check on libxml_set_streams_context() causes memleak)
Xinchen Hui [Tue, 30 Oct 2012 03:08:14 +0000 (11:08 +0800)]
Fixed bug #63389 (Missing context check on libxml_set_streams_context() causes memleak)

Simply change the expect parameter type, the valid of the resource will
be checked in using time.

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Derick Rethans [Sat, 27 Oct 2012 14:19:55 +0000 (15:19 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years ago- Updated to version 2012.8 (2012h)
Derick Rethans [Sat, 27 Oct 2012 14:19:54 +0000 (15:19 +0100)]
- Updated to version 2012.8 (2012h)

12 years agoFixed bug #63180 (Corruption of hash tables)
Dmitry Stogov [Fri, 26 Oct 2012 16:47:30 +0000 (09:47 -0700)]
Fixed bug #63180 (Corruption of hash tables)

12 years agofix bug #63369
Antony Dovgal [Fri, 26 Oct 2012 12:36:47 +0000 (16:36 +0400)]
fix bug #63369

(un)serialize() leaves dangling pointers, causes crashes

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Johannes Schlüter [Fri, 26 Oct 2012 12:22:31 +0000 (14:22 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

Conflicts:
ext/pdo_mysql/mysql_statement.c

12 years agoThis won't make the test pass but now its at least one that shows no unnecessary...
ULF WENDEL [Fri, 26 Oct 2012 10:32:10 +0000 (12:32 +0200)]
This won't make the test pass but now its at least one that shows no unnecessary error messages...

12 years agoNews entry for CURL notice addition
Anthony Ferrara [Thu, 25 Oct 2012 20:04:56 +0000 (16:04 -0400)]
News entry for CURL notice addition

12 years agoNotice if CURLOPT_SSL_VERIFYHOST is set to true
John Jawed (JJ) [Thu, 25 Oct 2012 04:47:47 +0000 (21:47 -0700)]
Notice if CURLOPT_SSL_VERIFYHOST is set to true

12 years agoFix for bug #62820
ULF WENDEL [Tue, 23 Oct 2012 13:13:57 +0000 (15:13 +0200)]
Fix for bug #62820

12 years agoFix for bug #62820 well hidden beneath a ton of whitespace changes. Do not use this...
ULF WENDEL [Tue, 23 Oct 2012 12:58:16 +0000 (14:58 +0200)]
Fix for bug #62820 well hidden beneath a ton of whitespace changes. Do not use this pdo factory stuff - you get a line with an error on it, use the mysql stuff in the tests

12 years agoMerge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
ULF WENDEL [Tue, 23 Oct 2012 11:16:12 +0000 (13:16 +0200)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

* 'PHP-5.4' of git.php.net:php-src:
  merged changes for bug #63297 from 5.3
  fixed a typo in the error message
  Fixed bug #63297 Phar fails to write an openssl based signature
  enabled libxpm for gd on windows
  enabled libxpm for gd on windows
  Update test script
  Test for #63336, xfail now
  Fixed bug #63305 (zend_mm_heap corrupted with traits)

12 years agomerged changes for bug #63297 from 5.3
Anatoliy Belsky [Thu, 25 Oct 2012 07:40:21 +0000 (09:40 +0200)]
merged changes for bug #63297 from 5.3

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatoliy Belsky [Thu, 25 Oct 2012 07:36:26 +0000 (09:36 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  fixed a typo in the error message

12 years agofixed a typo in the error message
Anatoliy Belsky [Thu, 25 Oct 2012 07:26:44 +0000 (09:26 +0200)]
fixed a typo in the error message

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatoliy Belsky [Wed, 24 Oct 2012 12:46:28 +0000 (14:46 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #63297 Phar fails to write an openssl based signature

12 years agoFixed bug #63297 Phar fails to write an openssl based signature
Anatoliy Belsky [Wed, 24 Oct 2012 11:38:44 +0000 (13:38 +0200)]
Fixed bug #63297 Phar fails to write an openssl based signature

Unitialized values warnings seem to be everyday life
when working with openssl. For more read
http://www.openssl.org/support/faq.html#PROG13
So just fixing so the bug, no care about those
warnings.

12 years agoenabled libxpm for gd on windows
Anatoliy Belsky [Wed, 24 Oct 2012 08:36:52 +0000 (10:36 +0200)]
enabled libxpm for gd on windows

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatoliy Belsky [Wed, 24 Oct 2012 08:35:07 +0000 (10:35 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  enabled libxpm for gd on windows

12 years agoenabled libxpm for gd on windows
Anatoliy Belsky [Wed, 24 Oct 2012 08:26:27 +0000 (10:26 +0200)]
enabled libxpm for gd on windows

12 years agoMerge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3
ULF WENDEL [Tue, 23 Oct 2012 11:15:46 +0000 (13:15 +0200)]
Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3

* 'PHP-5.3' of git.php.net:php-src:
  fixed a typo in the error message
  Fixed bug #63297 Phar fails to write an openssl based signature
  enabled libxpm for gd on windows

12 years agoUpdate test script
Xinchen Hui [Tue, 23 Oct 2012 09:28:52 +0000 (17:28 +0800)]
Update test script

12 years agoTest for #63336, xfail now
Xinchen Hui [Tue, 23 Oct 2012 08:35:56 +0000 (16:35 +0800)]
Test for #63336, xfail now