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