Rasmus Lerdorf
17b803d448
Merge branch 'PHP-5.4' into PHP-5.5
2012-12-13 16:17:34 -08:00
Rasmus Lerdorf
538d8338c0
Merge branch 'PHP-5.3' into PHP-5.4
2012-12-13 16:15:06 -08:00
Rasmus Lerdorf
eecdb4c254
Fix broken test
...
This was missing a %s for the path here
2012-12-13 16:13:37 -08:00
Arpad Ray
61bf1f4ee6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix #63379 - Don't reset mod_user_is_open in destroy
2012-12-13 23:59:34 +00:00
Arpad Ray
6566ea6173
Fix #63379 - Don't reset mod_user_is_open in destroy
...
The parent handler is still open so the reset here was in error.
2012-12-13 23:51:43 +00:00
Anatoliy Belsky
bef54e5365
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed mysqlnd compilation in debug mode on windows
2012-12-13 15:05:35 +01:00
Anatoliy Belsky
0d458ae89f
Fixed mysqlnd compilation in debug mode on windows
2012-12-13 15:01:01 +01:00
Xinchen Hui
4d2593e1be
Merge branch 'PHP-5.4' into PHP-5.5
2012-12-13 10:45:33 +08:00
Xinchen Hui
1f516510b7
Merge branch 'PHP-5.3' into PHP-5.4
2012-12-13 10:44:56 +08:00
Xinchen Hui
39a3007ab2
MFH
2012-12-13 10:44:14 +08:00
Remi Collet
6e4cfa18f7
Really fix test pdo_mysql_class_constants.phpt
...
- with mysqlnd, constant always present
- with mysqli, check client library version
- without mysqlnd and without mysqli
skip the test if no connection
use connection to check client library
Note : MySQLPDOTest::getClientVersion() is broken with mysqlnd
as PDO::ATTR_CLIENT_VERSION return "mysqlnd 5.0.11-dev - 20120503..."
so, getClientVersion() return "11"
2012-12-12 16:53:18 +01:00
Remi Collet
4d8d5d83fc
Fixed Bug #63738 unpack: back result with Z format
...
Fix result for empty string.
Same output as perl
perl -e 'print unpack("Z2","\0\0");' => ""
perl -e 'print unpack("Z2","A\0");' => "A"
perl -e 'print unpack("Z2","AB\0");' => "AB"
perl -e 'print unpack("Z2","ABC\0");'=> "AB"
2012-12-11 16:30:08 +01:00
Adam Harvey
8bb106d20c
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Alter php_json_decode_ex() to respect JSON_BIGINT_AS_STRING for bare numbers.
2012-12-11 19:53:02 +08:00
Adam Harvey
2d1694d4eb
Alter php_json_decode_ex() to respect JSON_BIGINT_AS_STRING for bare numbers.
...
Fixes bug #63737 (json_decode does not properly decode with options parameter).
2012-12-11 19:51:30 +08:00
Adam Harvey
b7091aaf01
Deprecate ext/mysql.
...
Per https://wiki.php.net/rfc/mysql_deprecation , connecting to a MySQL database
via ext/mysql now generates an E_DEPRECATED error. This commit includes the
minimal EXPECTF updates required for the test suite to pass: it may be
preferable to refactor some of the tests to suppress deprecation errors in
situations where no other error is expected from mysql_[p]connect(), but I'm
not enough of a MySQL expert to want to get my hands that dirty in a long
standing test suite.
2012-12-10 22:12:09 +08:00
Sebastian Bergmann
eab14993fe
Invoke re2c with --no-generation-date to prevent unintentional / unnecessary changes in generated files.
2012-12-06 09:28:35 +01:00
Dmitry Stogov
bc7857169a
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Use get_gc instead of hacks of get_properties
2012-12-05 17:59:46 +04:00
Dmitry Stogov
df97c3aa0d
Use get_gc instead of hacks of get_properties
2012-12-05 17:58:36 +04:00
Dmitry Stogov
274ceb3d8d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #63680 (Memleak in splfixedarray with cycle reference)
Conflicts:
NEWS
2012-12-05 17:55:21 +04:00
Dmitry Stogov
881416cda6
Fixed bug #63680 (Memleak in splfixedarray with cycle reference)
2012-12-05 17:53:26 +04:00
Stanislav Malyshev
1c8f106d9a
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix bug #63666 - Poor date() performance
2012-12-04 21:02:55 -08:00
Stanislav Malyshev
fd650ec93e
fix bug #63666 - Poor date() performance
2012-12-04 21:02:09 -08:00
Remi Collet
784850211e
Reduce case where this test will fails:
...
- no connection AND no mysqli extension
So, will succeed when no configured connection, but mysqli available.
2012-12-03 15:32:52 +01:00
Anatoliy Belsky
17dd769ab0
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Revert the previous test fix
2012-12-03 15:16:34 +01: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
Remi Collet
e3aad69ccc
Fix inifile.c:419:6: warning: variable 'ret' set but not used [-Wunused-but-set-variable]
...
Please check this minor change.
Avoid, warning: 'pos_grp_start' may be used uninitialized in this function [-Wmaybe-uninitialized]
2012-12-03 13:38:12 +01:00
Remi Collet
869e6508b3
use php_stream_copy_to_stream_ex instead of deprecated php_stream_copy_to_stream
2012-12-03 13:35:26 +01:00
Anatoliy Belsky
262decd35f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix test with a slightly different warning in TS
2012-12-03 10:44:10 +01:00
Anatoliy Belsky
89e547ce7f
Fix test with a slightly different warning in TS
2012-12-03 10:41:17 +01:00
Lars Strojny
575b983703
Merge branch 'PHP-5.4' into PHP-5.5
2012-12-02 19:42:25 +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
50fec2bae2
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed Bug #63435 Datetime::format('u') sometimes wrong by 1 microsecond
2012-12-01 10:26:32 +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
093d119597
Merge branch 'PHP-5.4' into PHP-5.5
2012-11-30 14:30:37 +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
9e1d3cfdab
Fixed bug #63271 (SOAP wsdl cache is not enabled after initial requests)
2012-11-29 16:44:19 +04: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
bf6fea6ba0
Fixed bug #61557 (Crasher in tt-rss backend.php)
2012-11-29 14:41:20 +04:00
Dmitry Stogov
1a09bf8023
Fixed bug #61557 (Crasher in tt-rss backend.php)
2012-11-29 14:38:18 +04:00
Anatoliy Belsky
f094723852
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows
Conflicts:
NEWS
2012-11-27 16:55:47 +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
17e21925c8
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
This test isn't supposed to pass on windows
2012-11-27 16:13:19 +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
8337c96656
Merge branch 'PHP-5.4' into PHP-5.5
2012-11-27 13:37:50 +08:00
Xinchen Hui
070239a194
Merge branch 'PHP-5.3' into PHP-5.4
2012-11-27 13:36:38 +08:00