Compare commits

...
248 Commits
Author SHA1 Message Date
Stanislav Malyshev 67f69d7be0 5.4.10 2012-12-18 22:55:19 -08:00
Stanislav Malyshev 12b0189c18 5.4.10 rc1 2012-12-04 21:36:09 -08:00
Stanislav Malyshev d398456e48 update NEWS 2012-12-04 21:27:25 -08:00
Stanislav Malyshev fd650ec93e fix bug #63666 - Poor date() performance 2012-12-04 21:02:09 -08:00
Anatoliy Belsky b8553d8494 Revert the previous test fix
The fail seems to be due to network error
2012-12-03 15:14:43 +01:00
Anatoliy Belsky 89e547ce7f Fix test with a slightly different warning in TS 2012-12-03 10:41:17 +01:00
Marco Pivetta 627eb9e3d9 Adding tests for private and protected properties 2012-12-02 19:47:18 +01:00
Marco Pivetta 12f451c771 Fixing test according to @jpauli's suggestions 2012-12-02 19:47:13 +01:00
Marco Pivetta 1377942b69 Adding regression test for behavior of magic methods with unset public properties
Verifies that after having unset a public property, any access to it, be it read or write, causes calls to public magic methods

Signed-off-by: Marco Pivetta <ocramius@gmail.com>
2012-12-02 19:47:09 +01:00
Lars Strojny 12de2e91d0 News entry for bug #49341 2012-12-02 19:41:19 +01:00
Igor Wiedler ec2a132f9c Bug #49341: Add SO_REUSEPORT support for socket_set_option()
This is a BSD-only feature, and it will only be available on BSD.
On other platforms the constant will simply not be set.
2012-12-02 18:56:57 +01:00
Remi Collet 7552a7eb19 NEWS 2012-12-01 10:26:20 +01:00
Remi Collet e9c1a45daa Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  NEWS
2012-12-01 10:25:49 +01:00
Remi Collet 31ab57e052 NEWS 2012-12-01 10:25:37 +01:00
Remi Collet 92a5e4def0 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed Bug #63435 Datetime::format('u') sometimes wrong by 1 microsecond
2012-12-01 10:24:02 +01:00
Remi Collet c2554b4bb4 Fixed Bug #63435 Datetime::format('u') sometimes wrong by 1 microsecond
When storing '015700' microseconds in a Datetime object,
Datetime::format('u') returns '015699'

Already known per bug45554 reproducer (also fixed).
2012-12-01 10:20:39 +01:00
Xinchen Hui 35f636019d Merge branch 'PHP-5.3' into PHP-5.4 2012-11-30 14:49:35 +08:00
Xinchen Hui ff6c9e2726 Fixed bug #63377 (Segfault on output buffer) 2012-11-30 14:48:51 +08:00
Xinchen Hui 96300f551a format 2012-11-30 14:33:29 +08:00
Xinchen Hui dc36933181 Merge branch 'PHP-5.3' into PHP-5.4 2012-11-30 14:33:24 +08:00
Xinchen Hui 00d86afedf Format 2012-11-30 14:32:15 +08:00
Xinchen Hui b689819567 Merge branch 'PHP-5.3' into PHP-5.4 2012-11-30 14:29:59 +08:00
Xinchen Hui 40fabf68ed Fixed bug #63398 (Segfault when polling closed link) 2012-11-30 14:28:32 +08:00
Dmitry Stogov 7f7cff0bbb Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed bug #63271 (SOAP wsdl cache is not enabled after initial requests)

Conflicts:
	NEWS
	ext/soap/soap.c
2012-11-29 16:41:09 +04:00
Dmitry Stogov dc2192c087 Fixed bug #63271 (SOAP wsdl cache is not enabled after initial requests) 2012-11-29 16:31:08 +04:00
Dmitry Stogov 1a09bf8023 Fixed bug #61557 (Crasher in tt-rss backend.php) 2012-11-29 14:38:18 +04:00
Dmitry Stogov f877d7fee6 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed bug #63635 (Segfault in gc_collect_cycles)

Conflicts:
	NEWS
2012-11-29 12:38:34 +04:00
Dmitry Stogov 92e2f29381 Fixed bug #63635 (Segfault in gc_collect_cycles) 2012-11-29 12:25:20 +04:00
Remi Collet c37d7a9456 NEWS 2012-11-28 10:45:23 +01:00
Remi Collet 487b7c7f32 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed Bug #63581 Possible buffer overflow
  Fixed Bug #63581 Possible null dereference
2012-11-28 10:38:13 +01:00
Remi Collet bc492007da Fixed Bug #63581 Possible buffer overflow
In fpm-log, possible buffer overflow. Check for length is done at
the beginning of the loop, so is not done when overflow occurs
on the last loop (len = 1024 or 1025). (ack from fat).

This issue where found from by static code analysis tool and, so,
I can't provide any reproducer.
2012-11-28 10:35:04 +01:00
Remi Collet 0f4772d12f Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
* 'PHP-5.4' of git.php.net:php-src:
  BFN #61272
  fix bug #61272 ob_start callback get passed empty string
  Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows
  This test isn't supposed to pass on windows
  Fixed Bug #63614 (Fatal error on Reflection)
2012-11-28 10:31:49 +01:00
Remi Collet f08060a48f Fixed Bug #63581 Possible null dereference
Possible NULL dereference when trying to delete the single item
of a list (ack from fat).

This issues where found from by static code analysis tool and,
so, I can't provide any reproducer.
2012-11-28 10:28:18 +01:00
Remi Collet 1e6baa2673 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 bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows
  This test isn't supposed to pass on windows
  Fixed Bug #63614 (Fatal error on Reflection)
2012-11-28 10:24:32 +01:00
Michael Wallner be1e5b9c54 BFN #61272 2012-11-28 10:23:26 +01:00
Michael Wallner 575790e842 fix bug #61272 ob_start callback get passed empty string 2012-11-28 10:19:44 +01:00
Anatoliy Belsky d88017e992 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows

Conflicts:
	NEWS
	ext/fileinfo/libmagic.patch
	ext/fileinfo/tests/finfo_open_error-win32.phpt
2012-11-27 16:45:25 +01:00
Anatoliy Belsky e6b727d3b7 Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows 2012-11-27 16:33:58 +01:00
Anatoliy Belsky e0ad33c24a Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  This test isn't supposed to pass on windows
2012-11-27 16:11:53 +01:00
Anatoliy Belsky eff12e56b6 This test isn't supposed to pass on windows 2012-11-27 16:02:55 +01:00
Xinchen Hui 070239a194 Merge branch 'PHP-5.3' into PHP-5.4 2012-11-27 13:36:38 +08:00
Xinchen Hui df3b9a1e07 Fixed Bug #63614 (Fatal error on Reflection) 2012-11-27 13:34:36 +08:00
Remi Collet 7751a68824 Related bug #63588 fix length computation + optimize for speed
Following comment from Yoram "The patch looks fine, except of testing
for true value of utf16 in each iteration."
Also fix the length computation during check phase.
2012-11-26 12:59:08 +01:00
Remi Collet 289bb339c9 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.
2012-11-25 08:14:23 +01:00
Remi Collet 8d2c44b59d 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.
2012-11-25 07:46:02 +01:00
Remi Collet 137503dd6f NEWS entries 2012-11-25 07:40:39 +01:00
Stanislav Malyshev c08e2c8c17 fix NEWS 2012-11-24 16:28:56 -08:00
Stanislav Malyshev 7262bf67a2 5.4.10-dev 2012-11-24 16:24:05 -08:00
Remi Collet 67e67c254d 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
2012-11-24 17:47:51 +01:00
Remi Collet 88d2b8c5fd Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  add unit test for bug 63126
  NEWS
2012-11-24 17:31:18 +01:00
Remi Collet 92147243bf add unit test for bug 63126 2012-11-24 17:30:48 +01:00
Remi Collet 90d2561a9c NEWS 2012-11-24 15:23:25 +01:00
Remi Collet 7cd2f4b6a6 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed Bug #63126 DISABLE_AUTHENTICATOR ignores array
2012-11-24 15:01:24 +01:00
Remi Collet f55bed9dad Fixed Bug #63126 DISABLE_AUTHENTICATOR ignores array 2012-11-24 15:00:03 +01:00
Anatoliy Belsky 9d8ed21bd5 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Backported the fix for bug #63248 from 5.4+
2012-11-23 14:00:30 +01:00
Anatoliy Belsky 8a84b1b5d9 Backported the fix for bug #63248 from 5.4+ 2012-11-23 13:58:22 +01:00
Anatoliy Belsky dc862f4fd4 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed test for bug #63297
2012-11-22 19:04:49 +01:00
Anatoliy Belsky 1702024073 Fixed test for bug #63297 2012-11-22 19:01:09 +01:00
Johannes Schlüter 6bd0a92a35 Merge branch 'PHP-5.3' into PHP-5.4 2012-11-21 21:09:57 +01:00
Johannes Schlüter cc315e79e1 PHP 5.3.19 2012-11-21 21:09:25 +01:00
Xinchen Hui e54970aaf1 Unused variable copystr
copystr is declared again blow
2012-11-21 12:30:03 +08:00
Dmitry Stogov 111aa9fd2e Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed bug #63468 (wrong called method as callback with inheritance)

Conflicts:
	NEWS
2012-11-20 12:54:40 +04:00
Dmitry Stogov 396c1e990a Fixed bug #63468 (wrong called method as callback with inheritance) 2012-11-20 12:51:55 +04:00
Christopher Jones 75746d60b6 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
2012-11-18 14:20:53 -08:00
Christopher Jones d412152f31 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
2012-11-18 14:20:49 -08:00
Pierrick Charron 99edb55e41 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
2012-11-16 18:24:42 -05:00
Pierrick Charron c886691100 Regenerate Zend ini scanner
Regenerate both zend_ini_scanner.c and zend_ini_scanner_defs.h
2012-11-16 18:16:21 -05:00
Pierrick Charron 15ab75be8a 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
2012-11-16 18:07:02 -05:00
Pierrick Charron 6dff07aa8c Fixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from value
Restore the old behavior but keep bug 51094 fixed
2012-11-16 18:04:14 -05:00
Christopher Jones 975fb4e3ea 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
2012-11-15 19:29:48 -08:00
Christopher Jones 16f9f46935 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
2012-11-15 19:29:44 -08:00
Johannes Schlüter 2a59f1d06c Merge branch 'PHP-5.3' into PHP-5.4 2012-11-15 12:29:38 +01:00
Johannes Schlüter 7468fc0e37 Skip test if directory does not exist
Would be good to run this using a directory which is existing
everywhere.
2012-11-15 12:28:19 +01:00
Anatoliy Belsky 3d82f16c7d Fixed test sapi/cli/tests/006.phpt
Third param in preg_match_all() is optional for a while )
2012-11-14 16:20:59 +01:00
Dmitry Stogov f99befadbd Fixed compiler reenterability 2012-11-14 17:47:27 +04:00
Dmitry Stogov 65585b3aa2 Fixed compiler reenterability 2012-11-14 17:45:10 +04:00
Anatoliy Belsky 5a1d2fe415 UPdated NEWS 2012-11-14 10:06:46 +01:00
Anatoliy Belsky 55a4da7f53 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Updated NEWS
2012-11-14 10:04:27 +01:00
Anatoliy Belsky f5d8b638c7 Updated NEWS 2012-11-14 10:02:35 +01:00
Anatoliy Belsky 117d2dd688 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Enabled apache 2.4 handler build option

Conflicts:
	sapi/apache2handler/config.w32
2012-11-13 19:40:22 +01:00
Pierre Joye 019bdff395 Enabled apache 2.4 handler build option 2012-11-13 19:34:00 +01:00
Derick Rethans 4f36aeb120 Merge branch 'PHP-5.3' into PHP-5.4
Conflicts:
	NEWS
2012-11-13 10:16:58 +00:00
Derick Rethans 00ad4c0e6a - Updated to version 2012.10 (2012j) 2012-11-13 10:15:34 +00:00
Derick Rethans 1e081a825e Merge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3 2012-11-13 10:10:41 +00:00
Derick Rethans d9aea7cd4d Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4 2012-11-13 10:10:28 +00:00
Adam Harvey 6b9df7a454 Merge branch 'preg_match_all_arginfo' into PHP-5.4
* preg_match_all_arginfo:
  Update arginfo for preg_match_all() to reflect reality.
2012-11-12 20:08:01 +08:00
Adam Harvey bca8ff723d 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.
2012-11-12 20:04:26 +08:00
Antony Dovgal 5b82fb52fd fix invalid read when trimming empty string 2012-11-11 22:38:14 +04:00
Antony Dovgal bb60122c2f fix invalid read when trimming empty string 2012-11-11 22:37:04 +04:00
Felipe Pena 065862a750 - BFN 2012-11-09 21:28:30 -02:00
Felipe Pena 964acdaa35 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)
2012-11-09 21:23:10 -02:00
Felipe Pena 44a6fe8411 - Fixed bug #63451 (config.guess file does not have AIX 7 defined, shared objects are not created) 2012-11-09 21:22:27 -02:00
Johannes Schlüter 9d95f7d286 Merge branch 'PHP-5.3' into PHP-5.4
Conflicts:
	configure.in
	main/php_version.h
2012-11-08 00:03:37 +01:00
Johannes Schlüter 417b1b238f This will be PHP 5.3.20 2012-11-08 00:01:43 +01:00
Stanislav Malyshev 3e7fcd9cab fix NEWS 2012-11-07 01:18:34 -08:00
Xinchen Hui e222837f6e Merge branch 'PHP-5.3' into PHP-5.4 2012-11-07 17:08:34 +08:00
Xinchen Hui 7fcbe4d546 Fixed bug #63447 (max_input_vars doesn't filter variables when mbstring.encoding_translation = On) 2012-11-07 17:05:24 +08:00
Xinchen Hui 6ef09012aa Merge branch 'PHP-5.3' into PHP-5.4 2012-11-06 14:14:55 +08:00
Rasmus Lerdorf 0ee5d18f91 News entry for png memleak fix 2012-11-05 21:06:18 -08:00
Rasmus Lerdorf 7caca1614b News entry for png memleak fix 2012-11-05 21:04:33 -08:00
Rasmus Lerdorf a983ded9bd Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3 2012-11-05 20:58:04 -08:00
Rasmus Lerdorf f8c280d85a These need to be volatile in order to prevent leaking after the
longjmp in the error handler
2012-11-05 20:57:15 -08:00
Rasmus Lerdorf f452b9056e These need to be volatile in order to prevent leaking after the
longjmp in the error handler
2012-11-05 20:57:07 -08:00
Derick Rethans db0f623490 Merge branch 'PHP-5.3' into PHP-5.4 2012-11-04 16:24:02 +00:00
Derick Rethans 1784279be0 - Updated to version 2012.9 (2012i) 2012-11-04 16:23:58 +00:00
Xinchen Hui 153bfada90 Merge branch 'PHP-5.3' into PHP-5.4 2012-11-02 18:56:17 +08:00
Xinchen Hui 3fe3029ecb Fixed bug #62444 (Handle leak in is_readable on windows). 2012-11-02 18:53:06 +08:00
Anatoliy Belsky 24e4af0b8f Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed bug #63241 PHP fails to open Windows deduplicated files.
2012-10-31 22:55:32 +01:00
Anatoliy Belsky a2e4404bc8 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.
2012-10-31 22:41:03 +01:00
Andrey Hristov 965bd32fec Merge branch 'PHP-5.3' into PHP-5.4 2012-10-31 18:29:31 +01:00
Andrey Hristov a17559d422 read 1 instead of 2 bytes. The next 2 bytes are 2 and thus not a problem 2012-10-31 18:26:09 +01:00
Xinchen Hui 7886f46b56 Fixed bug #63399 (ReflectionClass::getTraitAliases() incorrectly resolves traitnames) 2012-10-31 11:13:32 +08:00
David Soria Parra 440bbcd9e3 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
2012-10-30 15:43:32 +01:00
David Soria Parra b3cd64afef NEWS for bug #62593 2012-10-30 15:26:39 +01:00
Will Fitch d864063a18 Bug #62593 Updated to account for INOUT parameters 2012-10-30 14:32:32 +01:00
Will Fitch d922e801ee Bug #62593 Updated test to verify bindParam doesn't change original value 2012-10-30 14:32:27 +01:00
Will Fitch 646c0e5738 Bug #62593 Updated to always treat zval by value 2012-10-30 14:32:22 +01:00
Will Fitch f0835c002d Bug #62593 Added test for change 2012-10-30 14:32:16 +01:00
Will Fitch 7ea4f73ad4 Bug #62593 Updated pdo_pgsql driver to convert boolean values to pg native format in emulation mode 2012-10-30 14:32:09 +01:00
Xinchen Hui 3342e7276c Merge branch 'PHP-5.3' into PHP-5.4 2012-10-30 11:10:26 +08:00
Xinchen Hui 2f1c4064f8 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.
2012-10-30 11:08:14 +08:00
Derick Rethans 4c08ee069c Merge branch 'PHP-5.3' into PHP-5.4 2012-10-27 15:19:55 +01:00
Derick Rethans b5344e267a - Updated to version 2012.8 (2012h) 2012-10-27 15:19:54 +01:00
Dmitry Stogov 68b229ea73 Fixed bug #63180 (Corruption of hash tables) 2012-10-26 09:47:30 -07:00
Antony Dovgal f2bffdc2e4 fix bug #63369
(un)serialize() leaves dangling pointers, causes crashes
2012-10-26 16:41:14 +04:00
Johannes Schlüter 4f4d77805c Merge branch 'PHP-5.3' into PHP-5.4
Conflicts:
	ext/pdo_mysql/mysql_statement.c
2012-10-26 14:22:31 +02:00
ULF WENDEL 056ecf3201 This won't make the test pass but now its at least one that shows no unnecessary error messages... 2012-10-26 12:32:10 +02:00
Anthony Ferrara c4ce96d073 News entry for CURL notice addition 2012-10-25 16:04:56 -04:00
John Jawed (JJ) f68f31f121 Notice if CURLOPT_SSL_VERIFYHOST is set to true 2012-10-25 16:00:02 -04:00
ULF WENDEL 0737be7e7b Fix for bug #62820 2012-10-23 15:13:57 +02:00
ULF WENDEL 848780606d 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 2012-10-23 14:58:16 +02:00
ULF WENDEL 38b632dd7c 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)
2012-10-23 13:16:12 +02:00
Anatoliy Belsky f962260081 merged changes for bug #63297 from 5.3 2012-10-25 09:40:21 +02:00
Anatoliy Belsky 9a6d8e250a Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  fixed a typo in the error message
2012-10-25 09:36:26 +02:00
Anatoliy Belsky 6e23cfeba4 fixed a typo in the error message 2012-10-25 09:26:44 +02:00
Anatoliy Belsky 684f29a527 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed bug #63297 Phar fails to write an openssl based signature
2012-10-24 14:46:28 +02:00
Anatoliy Belsky a88379e03d 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.
2012-10-24 13:38:44 +02:00
Anatoliy Belsky e3ac418309 enabled libxpm for gd on windows 2012-10-24 10:36:52 +02:00
Anatoliy Belsky 3b7ee4dced Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  enabled libxpm for gd on windows
2012-10-24 10:35:07 +02:00
Anatoliy Belsky b48e163c35 enabled libxpm for gd on windows 2012-10-24 10:26:27 +02:00
ULF WENDEL bac9d118ed 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
2012-10-23 13:15:46 +02:00
Xinchen Hui 22d4205783 Update test script 2012-10-23 17:28:52 +08:00
Xinchen Hui 0b8b264107 Test for #63336, xfail now 2012-10-23 16:35:56 +08:00
Xinchen Hui 74228c5151 Fixed bug #63305 (zend_mm_heap corrupted with traits) 2012-10-23 11:34:25 +08:00
ULF WENDEL 77fd708a0b Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
* 'PHP-5.4' of git.php.net:php-src: (22 commits)
  Re-fixed bug #60901 (Improve "tail" syntax for AIX installation)
  update NEWS
  updated NEWS
  Fixed bug #63284 PCRE upgrade to 8.31
  preg indenpent test script for #63055
  Update libmagic.patch
  Add fix & missing fix
  Add fix & missing fix
  Fixed bug #63307 (Unused variable in oci8.c)
  Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro)
  - Updated to version 2012.7 (2012g)
  SUpport newer bisons.
  Merge the fix for #61964 to 5.3, which will fix #63304
  indent
  better fix for #63055
  Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
  I forgot that inconsistent is only avaliable in debug mode
  Add comments
  Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
  PHP 5.3.18 NEWS
  ...
2012-10-22 13:38:02 +02:00
ULF WENDEL dfeb91acc7 Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3
* 'PHP-5.3' of git.php.net:php-src: (123 commits)
  Re-fixed bug #60901 (Improve "tail" syntax for AIX installation)
  updated NEWS
  Fixed bug #63284 PCRE upgrade to 8.31
  preg indenpent test script for #63055
  Update libmagic.patch
  Add fix & missing fix
  Fixed bug #63307 (Unused variable in oci8.c)
  Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro)
  - Updated to version 2012.7 (2012g)
  SUpport newer bisons.
  Merge the fix for #61964 to 5.3, which will fix #63304
  indent
  better fix for #63055
  Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
  PHP 5.3.18 NEWS
  fix NEWS
  fix compilation failure on 32/64bit linux systems, when libmysql is used  with ext/mysql
  Remove executable permission on inc
  Remove executable permission on phpt
  Fixed bug #63236 (Executable permission on various source files)
  ...
2012-10-22 13:37:37 +02:00
Christopher Jones 7d59b2264e Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Re-fixed bug #60901 (Improve "tail" syntax for AIX installation)
2012-10-21 22:21:46 -07:00
Christopher Jones dbb72de6c7 Re-fixed bug #60901 (Improve "tail" syntax for AIX installation)
The original fix broke Solaris installs of OCI8
2012-10-21 22:17:47 -07:00
Anatoliy Belsky cbb857f8b9 update NEWS 2012-10-19 09:58:46 +02:00
Anatoliy Belsky dfb1956f1a Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  updated NEWS
2012-10-19 09:57:00 +02:00
Anatoliy Belsky 7293cb7250 updated NEWS 2012-10-19 09:56:02 +02:00
Anatoliy Belsky d2fa182f25 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed bug #63284 PCRE upgrade to 8.31
2012-10-19 09:51:58 +02:00
Anatoliy Belsky 276c5de0d8 Fixed bug #63284 PCRE upgrade to 8.31 2012-10-19 09:49:28 +02:00
Xinchen Hui bb51549915 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-19 11:24:15 +08:00
Xinchen Hui 90bd54c46e preg indenpent test script for #63055 2012-10-19 11:22:56 +08:00
Xinchen Hui dfd4244e73 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-19 11:15:03 +08:00
Xinchen Hui 6444eef27b Update libmagic.patch 2012-10-19 11:14:14 +08:00
Christopher Jones 05a843c256 Add fix & missing fix 2012-10-18 18:55:15 -07:00
Christopher Jones c6d6ede4a8 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Add fix & missing fix
2012-10-18 18:51:40 -07:00
Christopher Jones 106c70e76e Add fix & missing fix 2012-10-18 18:50:18 -07:00
Christopher Jones 85b0eda4c8 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed bug #63307 (Unused variable in oci8.c)
  Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro)
2012-10-18 17:57:19 -07:00
Christopher Jones af14da5714 Fixed bug #63307 (Unused variable in oci8.c)
An output section for oci_internal_debug() was setting but not using a variable
2012-10-18 17:53:00 -07:00
Christopher Jones 8bfc002871 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: (22 commits)
  - Updated to version 2012.7 (2012g)
  SUpport newer bisons.
  Merge the fix for #61964 to 5.3, which will fix #63304
  indent
  better fix for #63055
  Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
  I forgot that inconsistent is only avaliable in debug mode
  Add comments
  Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
  PHP 5.3.18 NEWS
  fix NEWS
  fix compilation failure on 32/64bit linux systems, when libmysql is used  with ext/mysql
  Fixed bug #63248 Load multiple magic files on win
  Cover have_ssl=NO and have_ssl=DISABLED
  - BFN
  - Fixed bug #63214 (Large PDO Firebird Queries)
  Fix bug #63240 on stream_get_line()
  extended the SKIPIF section with ICU 49 (sync with 5.4 branch)
  fixed tests for gd having freetype >= 2.4.10
  Fixed bug #63258 (seg fault with PDO and dblib using DBSETOPT(H->link, DBQUOTEDIDENT, 1))
  ...
2012-10-18 17:37:49 -07:00
Christopher Jones 79a048f76f 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:
  - Updated to version 2012.7 (2012g)
  SUpport newer bisons.
  Merge the fix for #61964 to 5.3, which will fix #63304
  indent
  better fix for #63055
  Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
  PHP 5.3.18 NEWS
  fix NEWS
  fix compilation failure on 32/64bit linux systems, when libmysql is used  with ext/mysql
  Cover have_ssl=NO and have_ssl=DISABLED
  Minor changes for MySQL 5.6
  NEWS for 76601c4
  Fix bug #63240 on stream_get_line()
  extended the SKIPIF section with ICU 49 (sync with 5.4 branch)
  fixed tests for gd having freetype >= 2.4.10
2012-10-18 17:37:21 -07:00
Christopher Jones 131dd88505 Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro)
Improve high availability for explicitly terminated connections.
2012-10-18 17:33:51 -07:00
Derick Rethans 4980b24025 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-18 21:53:04 +01:00
Derick Rethans 8f7a6c3029 - Updated to version 2012.7 (2012g) 2012-10-18 21:53:03 +01:00
Derick Rethans b58d45b67f Merge branch 'PHP-5.3' into PHP-5.4
Conflicts:
	Zend/acinclude.m4
2012-10-18 17:53:55 +01:00
Derick Rethans 7aed21c557 SUpport newer bisons. 2012-10-18 17:53:21 +01:00
Xinchen Hui 08a06597e6 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-18 23:32:48 +08:00
Xinchen Hui 0d7965f0a3 Merge the fix for #61964 to 5.3, which will fix #63304 2012-10-18 23:29:33 +08:00
Xinchen Hui f1478bbf9d Merge branch 'PHP-5.3' into PHP-5.4 2012-10-18 20:13:36 +08:00
Xinchen Hui db2dc7a6a4 indent 2012-10-18 20:13:14 +08:00
Xinchen Hui 1f8fd609b0 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-18 20:11:32 +08:00
Xinchen Hui e88cdaa014 better fix for #63055 2012-10-18 20:10:35 +08:00
Xinchen Hui 54cef2bb6d Merge branch 'PHP-5.3' into PHP-5.4 2012-10-18 17:33:52 +08:00
Xinchen Hui 8bd5e15ff7 Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite) 2012-10-18 17:31:27 +08:00
Xinchen Hui 4d509708a4 I forgot that inconsistent is only avaliable in debug mode 2012-10-18 16:33:07 +08:00
Xinchen Hui 08b9702f8a Add comments 2012-10-18 16:06:20 +08:00
Xinchen Hui ccc519b7a9 Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
This should also fixed various segfaults which the bt looks like cored in zval_mark_grey
2012-10-18 15:49:37 +08:00
Johannes Schlüter 82fb5df380 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-17 18:26:27 +02:00
Johannes Schlüter 3899adb46f PHP 5.3.18 NEWS 2012-10-17 18:25:40 +02:00
Andrey Hristov 505836e999 fix NEWS 2012-10-17 17:56:17 +02:00
Andrey Hristov 7314ed535f Merge branch 'PHP-5.3' of ssh://git.php.net/php-src into PHP-5.3 2012-10-17 17:23:37 +02:00
Andrey Hristov c50d732f76 fix compilation failure on 32/64bit linux systems, when libmysql is used
with ext/mysql
2012-10-17 17:22:31 +02:00
Christopher Jones de8b0cfda7 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:
  Implemented FR #63242 (Default error page in PHP built-in web server uses outdated html/css)
  Fix warnings preventing this test from passing
  Remove executable permission on inc
2012-10-10 17:28:35 -07:00
Christopher Jones 0da5517cb9 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:
  Remove executable permission on inc
2012-10-10 17:28:31 -07:00
Xinchen Hui 07ea38b443 Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 2012-10-10 17:24:09 +08:00
Xinchen Hui ea441bd08d Implemented FR #63242 (Default error page in PHP built-in web server uses outdated html/css) 2012-10-10 17:23:30 +08:00
Anatoliy Belsky 674ccefc2d Fix warnings preventing this test from passing 2012-10-10 11:01:07 +02:00
Xinchen Hui 69a4301f6c Merge branch 'PHP-5.3' into PHP-5.4 2012-10-10 10:45:07 +08:00
Xinchen Hui 1b9e0de2cc Remove executable permission on inc 2012-10-10 10:44:34 +08:00
Christopher Jones a19bc9aa9f 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:
  Remove executable permission on phpt
  Remove executable permission on phpt
2012-10-09 19:37:06 -07:00
Christopher Jones 9ea862954b 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:
  Remove executable permission on phpt
2012-10-09 19:37:02 -07:00
Xinchen Hui 45e938ec34 Remove executable permission on phpt 2012-10-10 10:31:53 +08:00
Xinchen Hui e081c55fb5 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-10 10:31:31 +08:00
Xinchen Hui 610c7fbe7b Remove executable permission on phpt 2012-10-10 10:27:49 +08:00
Christopher Jones bef8ff4c7b 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:
  Fixed bug #63236 (Executable permission on various source files)
  Fixed bug #63235 (buffer overflow in use of SQLGetDiagRec)
2012-10-08 22:51:58 -07:00
Christopher Jones b597464905 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:
  Fixed bug #63236 (Executable permission on various source files)
  Fixed bug #63235 (buffer overflow in use of SQLGetDiagRec)
2012-10-08 22:51:54 -07:00
Xinchen Hui e4a8fa6a15 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-09 13:29:51 +08:00
Xinchen Hui 6284ef112e Fixed bug #63236 (Executable permission on various source files) 2012-10-09 13:28:31 +08:00
Xinchen Hui 931571260b Merge branch 'PHP-5.3' into PHP-5.4 2012-10-09 13:15:18 +08:00
Xinchen Hui 45e0d452c5 Fixed bug #63235 (buffer overflow in use of SQLGetDiagRec) 2012-10-09 13:13:51 +08:00
Christopher Jones 91169fb24f 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: (45 commits)
  Fixed bug #63219 (Segfault when aliasing trait method when autoloader throws excpetion)
  exposing the libxpm version in phpinfo
  5.4.9-dev
  PHP-5.3 branch is 5.3.19 now
  reverted the previous fix for libpng include
  fixed include checks for libpng under win
  Avoding superfluous function call
  Add test for #35895
  Now we can set the tsrm_ls manually
  Fixed bug #63184  test (ext/spl/tests/RecursiveDirectoryIterator_getSubPathname_basic.phpt failed)
  add news for --offline
  add --offline option to run-tests command
  Bug #63147: SKIP_ONLINE_TESTS, for getmxrr
  Bug #63147: introduce SKIP_ONLINE_TESTS, for gethostbyname
  gethostbyname_basic002.phpt is a duplicate to gethostbyname_error004.phpt
  add bug #63162
  fix test and move to proper place
  synergy ftl. Removed duplicate fields.
  adding test phpt
  Bug #63162 - parse_url does not matches password component
  ...
2012-10-08 16:13:07 -07:00
Christopher Jones 64cc5fc15d 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:
  exposing the libxpm version in phpinfo
  PHP-5.3 branch is 5.3.19 now
  reverted the previous fix for libpng include
  fixed include checks for libpng under win
  Avoding superfluous function call
  Add test for #35895
  Update NEWS
  FD_ZERO file descriptors before calling curl_multi_fdset
  Fixed bug #62216
  - Fixed bug #62887 (Only /status?plain&full gives "last request cpu")
  - Fixed bug #62947 (Unneccesary warnings on FPM)
  - add missing php-fpm.service.in
  - Fixed bug #63085 (Systemd integration and daemonize)
  - Fixed bug #62954 (startup problems fpm / php-fpm) - Fixed bug #62886 (PHP-FPM may segfault/hang on startup)
  - Updated to version 2012.6 (2012f)
  - Updated to version 2012.5 (2012e)
  - Updated to version 2012.4 (2012d)
2012-10-08 16:13:03 -07:00
Xinchen Hui 67611c67fa Fixed bug #63219 (Segfault when aliasing trait method when autoloader throws excpetion) 2012-10-08 22:59:52 +08:00
Anatoliy Belsky 9a99426e80 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  exposing the libxpm version in phpinfo
2012-10-04 18:21:07 +02:00
Anatoliy Belsky 5d9fb8ffeb exposing the libxpm version in phpinfo 2012-10-04 18:20:02 +02:00
Derick Rethans b004a04f0a Merge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3 2012-10-04 08:39:34 +01:00
Derick Rethans 34eb787828 Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4 2012-10-04 08:39:21 +01:00
Stanislav Malyshev 9e3396b85d 5.4.9-dev 2012-10-03 18:36:17 -07:00
Johannes Schlüter 5bbc489527 Merge branch 'PHP-5.3' into PHP-5.4
Conflicts:
	configure.in
	main/php_version.h
2012-10-04 02:37:04 +02:00
Johannes Schlüter 64c09f68ec PHP-5.3 branch is 5.3.19 now 2012-10-04 02:35:42 +02:00
ULF WENDEL c64ff20836 Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
* 'PHP-5.4' of git.php.net:php-src: (62 commits)
  Fixed bug #63248 Load multiple magic files on win
  Cover have_ssl=NO and have_ssl=DISABLED
  - BFN
  - Fixed bug #63214 (Large PDO Firebird Queries)
  Fix bug #63240 on stream_get_line()
  extended the SKIPIF section with ICU 49 (sync with 5.4 branch)
  fixed tests for gd having freetype >= 2.4.10
  Fixed bug #63258 (seg fault with PDO and dblib using DBSETOPT(H->link, DBQUOTEDIDENT, 1))
  Implemented FR #63242 (Default error page in PHP built-in web server uses outdated html/css)
  Fix warnings preventing this test from passing
  Remove executable permission on inc
  Remove executable permission on phpt
  Remove executable permission on phpt
  Fixed bug #63236 (Executable permission on various source files)
  Fixed bug #63235 (buffer overflow in use of SQLGetDiagRec)
  Fixed bug #63219 (Segfault when aliasing trait method when autoloader throws excpetion)
  exposing the libxpm version in phpinfo
  5.4.9-dev
  PHP-5.3 branch is 5.3.19 now
  reverted the previous fix for libpng include
  ...
2012-09-29 19:35:09 +02:00
ULF WENDEL 7aa3d0ae65 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Cover have_ssl=NO and have_ssl=DISABLED
2012-09-29 18:55:51 +02:00
ULF WENDEL 5e2222f028 Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
* 'PHP-5.4' of git.php.net:php-src:
  Fixed bug #63248 Load multiple magic files on win
2012-09-29 18:55:42 +02:00
Anatoliy Belsky 6d019deee2 Fixed bug #63248 Load multiple magic files on win
- adapt config.w32 to not to use dirent lib anymore
- prevent libmagic from opening a dir handle under win
- reimplement the dir iteration functionality with streams
2012-10-16 11:03:32 +02:00
ULF WENDEL da541ff561 Cover have_ssl=NO and have_ssl=DISABLED 2012-09-29 18:54:54 +02:00
ULF WENDEL 13d4d8e2d0 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Minor changes for MySQL 5.6
  NEWS for 76601c4

Conflicts:
	NEWS
2012-09-29 12:17:13 +02:00
Felipe Pena c8cc0cde34 - BFN 2012-10-12 19:48:30 -03:00
Felipe Pena 9a6bc88565 - Fixed bug #63214 (Large PDO Firebird Queries) 2012-10-12 19:42:43 -03:00
Gustavo Lopes f8e26d95f2 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug #63240 on stream_get_line()
2012-10-12 20:24:13 +02:00
Gustavo Lopes 76601c4fd1 Fix bug #63240 on stream_get_line()
stream_get_line() could contain the delimiter string if that string
had more than one character. The bug manifested itself when a read on
the stream ended with part of the delimiter string and the read after
would start with the rest of the delimiter string; provided that
the data of first read did not complete the max length result of the
call to stream_get_line() with the partial delimiter used in that max
length return. In that case, the delimiter will still appear in
the result, divided in two subsequent return values. That is not a bug.

See <http://www.mail-archive.com/internals@lists.php.net/msg61325.html>
2012-10-12 20:23:43 +02:00
Anatoliy Belsky 9eff1a2178 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  extended the SKIPIF section with ICU 49 (sync with 5.4 branch)
2012-10-12 19:53:35 +02:00
Anatoliy Belsky 5020b51d72 extended the SKIPIF section with ICU 49 (sync with 5.4 branch) 2012-10-12 19:50:35 +02:00
Anatoliy Belsky a36a5315b8 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  fixed tests for gd having freetype >= 2.4.10
2012-10-12 19:38:13 +02:00
Anatoliy Belsky 131d7d7a89 fixed tests for gd having freetype >= 2.4.10 2012-10-12 19:34:31 +02:00
Xinchen Hui 0c0b5a3543 Fixed bug #63258 (seg fault with PDO and dblib using DBSETOPT(H->link, DBQUOTEDIDENT, 1))
The exists test should has covered this bug
2012-10-12 10:37:05 +08:00
ULF WENDEL 20e76f4487 Minor changes for MySQL 5.6 2012-09-29 12:10:24 +02:00
Gustavo Lopes 519f93ef99 NEWS for 76601c4 2012-10-12 20:27:53 +02:00
Christopher Jones f0c65bc0e3 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:
  Correct the test summary
  Fixed bug #60723 (error_log error time has changed to UTC ignoring default timezo)
  Fixed bug #60723 (error_log error time has changed to UTC ignoring default timezo)
  Avoid calling select if maxfd returned by curl_multi_fdset is -1
  Fixing NEWS file
  Fixed bug #63111 (is_callable() lies for abstract static method)
  updated lib versions
  Fix folding
  fix bug #63015 (Incorrect arginfo for DOMErrorHandler)
2012-09-26 16:31:18 -07:00
Christopher Jones bf50416744 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:
  Correct the test summary
  Fixed bug #60723 (error_log error time has changed to UTC ignoring default timezo)
  Avoid calling select if maxfd returned by curl_multi_fdset is -1
  Fixed bug #63111 (is_callable() lies for abstract static method)
  updated lib versions
2012-09-26 16:31:14 -07:00
Christopher Jones 2141c502ae 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:
  Bug #63000: MCAST_JOIN_GROUP on OSX is broken
  Fixed bug #61442 (exception threw in __autoload can not be catched)
2012-09-19 17:09:25 -07:00
Christopher Jones f81c312945 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:
  Fixed bug #61442 (exception threw in __autoload can not be catched)
2012-09-19 17:09:21 -07:00
Christopher Jones 4ec1a2ab04 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:
  Merging PR #116
  Merged GitHub PR #190: Support for the HTTP PATCH method in CLI webserver
  updated libary versions
  split tests for the new zlib version on win
  Fixed Bug #63103 (ext\curl\tests\bug62839.phpt broken)
2012-09-18 18:31:09 -07:00
Christopher Jones 40afaa957b 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:
  updated libary versions
  split tests for the new zlib version on win
  Fixed Bug #63103 (ext\curl\tests\bug62839.phpt broken)
2012-09-18 18:31:05 -07:00
Christopher Jones 1a55451651 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:
  update news
  Support building PHP with the native client toolchain.
  test should fail
2012-09-17 17:10:57 -07:00
Christopher Jones f1af61de0b 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:
  test should fail
2012-09-17 17:10:53 -07:00
Christopher Jones fad047710c 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:
  Respond with 501 to unknown request methods
  news for bug #61421
  commit for php bug 61421 enabling SHA2 and RMD160 for openssl signature verification
  Fixed bug #63093 (Segfault while load extension failed in zts-build).
  Remove bug fixed entry
  Add XFAIL test for bug #62852
  Revert "Fixed bug #62852 (Unserialize invalid DateTime causes crash)"
2012-09-16 18:37:30 -07:00
Christopher Jones 836c4e3aef 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:
  Fixed bug #63093 (Segfault while load extension failed in zts-build).
  Add XFAIL test for bug #62852
  Revert "Fixed bug #62852 (Unserialize invalid DateTime causes crash)"
2012-09-16 18:37:25 -07:00
Derick Rethans ab62ffa0a2 Merge branch 'PHP-5.3' into PHP-5.4 2012-09-14 09:38:32 +01:00
Derick Rethans 78354f30d9 - Updated to version 2012.6 (2012f) 2012-09-14 09:38:31 +01:00
Derick Rethans bc602495d7 Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4 2012-08-24 10:56:03 +02:00
Derick Rethans e5bfcd340a Merge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3 2012-08-24 10:55:17 +02:00
Derick Rethans de59314a60 Merge branch 'PHP-5.3' into PHP-5.4 2012-08-06 12:59:39 +01:00
Derick Rethans 0a2833bbef - Updated to version 2012.5 (2012e) 2012-08-06 12:59:38 +01:00
Derick Rethans ceee821d73 Merge branch 'PHP-5.3' into PHP-5.4 2012-07-20 10:07:24 +01:00
Derick Rethans d621a91a50 - Updated to version 2012.4 (2012d) 2012-07-20 10:07:23 +01:00
1314 changed files with 44686 additions and 32280 deletions

No files matched your search

+134 -1
View File
@@ -1,14 +1,133 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2012, PHP 5.4.8
20 Dec 2012, PHP 5.4.10
- Core:
. Fixed bug #63635 (Segfault in gc_collect_cycles). (Dmitry)
. Fixed bug #63512 (parse_ini_file() with INI_SCANNER_RAW removes quotes
from value). (Pierrick)
. Fixed bug #63468 (wrong called method as callback with inheritance).
(Laruence)
. Fixed bug #63451 (config.guess file does not have AIX 7 defined,
shared objects are not created). (kemcline at au1 dot ibm dot com)
. Fixed bug #61557 (Crasher in tt-rss backend.php).
(i dot am dot jack dot mail at gmail dot com)
. Fixed bug #61272 (ob_start callback gets passed empty string).
(Mike, casper at langemeijer dot eu)
- Date:
. Fixed bug #63666 (Poor date() performance). (Paul Talborg).
. Fixed bug #63435 (Datetime::format('u') sometimes wrong by 1 microsecond).
(Remi)
- Imap:
. Fixed bug #63126 (DISABLE_AUTHENTICATOR ignores array). (Remi)
- Json:
. Fixed bug #63588 (use php_next_utf8_char and remove duplicate
implementation). (Remi)
- MySQLi:
. Fixed bug #63361 (missing header). (Remi)
- MySQLnd:
. Fixed bug #63398 (Segfault when polling closed link). (Laruence)
- Fileinfo:
. Fixed bug #63590 (Different results in TS and NTS under Windows).
(Anatoliy)
- FPM:
. Fixed bug #63581 Possible null dereference and buffer overflow (Remi)
- Pdo_sqlite:
. Fixed Bug #63149 getColumnMeta should return the table name
when system SQLite used. (Remi)
- Apache2 Handler SAPI:
. Enabled Apache 2.4 configure option for Windows (Pierre, Anatoliy)
- Reflection:
. Fixed Bug #63614 (Fatal error on Reflection). (Laruence)
- SOAP
. Fixed bug #63271 (SOAP wsdl cache is not enabled after initial requests).
(John Jawed, Dmitry)
- Sockets
. Fixed bug #49341 (Add SO_REUSEPORT support for socket_set_option()).
(Igor Wiedler, Lars)
22 Nov 2012, PHP 5.4.9
- Core:
. Fixed bug #63305 (zend_mm_heap corrupted with traits). (Dmitry, Laruence)
. Fixed bug #63369 ((un)serialize() leaves dangling pointers, causes crashes).
(Tony, Andrew Sitnikov)
. Fixed bug #63241 (PHP fails to open Windows deduplicated files).
(daniel dot stelter-gliese at innogames dot de)
. Fixed bug #62444 (Handle leak in is_readable on windows).
(krazyest at seznam dot cz)
- Curl:
. Fixed bug #63363 (Curl silently accepts boolean true for SSL_VERIFYHOST).
Patch by John Jawed GitHub PR #221 (Anthony)
- Fileinfo:
. Fixed bug #63248 (Load multiple magic files from a directory under Windows).
(Anatoliy)
- Libxml
. Fixed bug #63389 (Missing context check on libxml_set_streams_context()
causes memleak). (Laruence)
- Mbstring:
. Fixed bug #63447 (max_input_vars doesn't filter variables when
mbstring.encoding_translation = On). (Laruence)
- OCI8:
. Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro)
(Chris Jones)
- PCRE:
. Fixed bug #63180 (Corruption of hash tables). (Dmitry)
. Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite).
(Dmitry, Laruence)
. Fixed bug #63284 (Upgrade PCRE to 8.31). (Anatoliy)
- PDO:
. Fixed bug #63235 (buffer overflow in use of SQLGetDiagRec).
(Martin Osvald, Remi)
- PDO_pgsql:
. Fixed bug #62593 (Emulate prepares behave strangely with PARAM_BOOL).
(Will Fitch)
- Phar:
. Fixed bug #63297 (Phar fails to write an openssl based signature).
(Anatoliy)
- Streams:
. Fixed bug #63240 (stream_get_line() return contains delimiter string).
(Tjerk, Gustavo)
- Reflection:
. Fixed bug #63399 (ReflectionClass::getTraitAliases() incorrectly resolves
traitnames). (Laruence)
18 Oct 2012, PHP 5.4.8
- CLI server:
. Implemented FR #63242 (Default error page in PHP built-in web server uses
outdated html/css). (pascal.chevrel@free.fr)
. Changed response to unknown HTTP method to 501 according to RFC.
(Niklas Lindgren).
. Support HTTP PATCH method. Patch by Niklas Lindgren, GitHub PR #190.
(Lars)
- Core:
. Fixed bug #63219 (Segfault when aliasing trait method when autoloader
throws excpetion). (Laruence)
. Added optional second argument for assert() to specify custom message. Patch
by Lonny Kapelushnik (lonny@lonnylot.com). (Lars)
. Support building PHP with the native client toolchain. (Stuart Langley)
@@ -49,10 +168,23 @@ PHP NEWS
. Fixed bug #62887 (Only /status?plain&full gives "last request cpu"). (fat)
. Fixed bug #62216 (Add PID to php-fpm init.d script). (fat)
- OCI8:
. Fixed bug #60901 (Improve "tail" syntax for AIX installation) (Chris Jones)
- OpenSSL:
. Implemented FR #61421 (OpenSSL signature verification missing RMD160,
SHA224, SHA256, SHA384, SHA512). (Mark Jones)
- PDO:
. Fixed bug #63258 (seg fault with PDO and dblib using DBSETOPT(H->link,
DBQUOTEDIDENT, 1)). (Laruence)
. Fixed bug #63235 (buffer overflow in use of SQLGetDiagRec).
(Martin Osvald, Remi)
- PDO Firebird:
. Fixed bug #63214 (Large PDO Firebird Queries).
(james at kenjim dot com)
- SOAP
. Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice).
(Dmitry)
@@ -1283,6 +1415,7 @@ PHP NEWS
- Gd:
. Fixed bug #60160 (imagefill() doesn't work correctly
for small images). (Florian)
. Fixed potential memory leak on a png error (Rasmus, Paul Saab)
- Intl:
. Fixed bug #60192 (SegFault when Collator not constructed
+9
View File
@@ -40,6 +40,10 @@
# define IO_REPARSE_TAG_SYMLINK 0xA000000C
# endif
# ifndef IO_REPARSE_TAG_DEDUP
# define IO_REPARSE_TAG_DEDUP 0x80000013
# endif
# ifndef VOLUME_NAME_NT
# define VOLUME_NAME_NT 0x2
# endif
@@ -945,6 +949,11 @@ static int tsrm_realpath_r(char *path, int start, int len, int *ll, time_t *t, i
return -1;
};
substitutename[substitutename_len] = 0;
}
else if (pbuffer->ReparseTag == IO_REPARSE_TAG_DEDUP) {
isabsolute = 1;
memcpy(substitutename, path, len + 1);
substitutename_len = len;
} else {
tsrm_free_alloca(pbuffer, use_heap_large);
return -1;
+4 -1
View File
@@ -193,7 +193,7 @@ Finished:
TSRM_API int tsrm_win32_access(const char *pathname, int mode TSRMLS_DC)
{
time_t t;
HANDLE thread_token;
HANDLE thread_token = NULL;
PSID token_sid;
SECURITY_INFORMATION sec_info = OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION;
GENERIC_MAPPING gen_map = { FILE_GENERIC_READ, FILE_GENERIC_WRITE, FILE_GENERIC_EXECUTE, FILE_ALL_ACCESS };
@@ -363,6 +363,9 @@ Finished_Impersonate:
}
Finished:
if(thread_token != NULL) {
CloseHandle(thread_token);
}
if(real_path != NULL) {
free(real_path);
real_path = NULL;
+2
View File
@@ -525,6 +525,8 @@ b. Extensions with changed behavior
must be activated manually with the "extension = php_com_dotnet.dll" directive
in php.ini.
- Apache 2.4 handler is supported as of PHP 5.4.9
==================
12. New in PHP 5.4
==================
+1 -1
View File
@@ -4,7 +4,7 @@ dnl This file contains local autoconf functions.
AC_DEFUN([LIBZEND_BISON_CHECK],[
# we only support certain bison versions
bison_version_list="1.28 1.35 1.75 1.875 2.0 2.1 2.2 2.3 2.4 2.4.1 2.4.2 2.4.3 2.5 2.5.1"
bison_version_list="1.28 1.35 1.75 1.875 2.0 2.1 2.2 2.3 2.4 2.4.1 2.4.2 2.4.3 2.5 2.5.1 2.6 2.6.1 2.6.2"
# for standalone build of Zend Engine
test -z "$SED" && SED=sed
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Executable → Regular
View File
File mode changed.
Loaded 100 of 1314 files, more files were not shown because too many files have changed in this diff. Show more