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
Bernhard K. Weisshuhn
180767373d
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.
2012-11-11 20:11:06 +01:00
Antony Dovgal
4029475e82
fix invalid read when trimming empty string
2012-11-11 22:38:18 +04: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
80682bdcd8
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)
2012-11-09 21:24:05 -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
e383d4d20d
Merge branch 'PHP-5.4'
2012-11-08 00:04:08 +01: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
63307de7b6
Merge branch 'PHP-5.4'
...
* PHP-5.4:
fix NEWS
2012-11-07 01:19:20 -08:00
Stanislav Malyshev
3e7fcd9cab
fix NEWS
2012-11-07 01:18:34 -08:00
Xinchen Hui
b936a815fb
Merge branch 'PHP-5.4'
2012-11-07 17:09:27 +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
Rasmus Lerdorf
261e32f623
These need to be volatile in order to prevent leaking after the
...
longjmp in the error handler
2012-11-05 20:56:19 -08:00
Derick Rethans
37cc133d6f
Merge branch 'PHP-5.4'
2012-11-04 16:24:07 +00: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
7bcb8780e0
Fixed bug #63428 (The behavior of execute() changed)
2012-11-04 12:48:35 +08:00
Xinchen Hui
3c6b0db052
The /e modifier is deprecated
2012-11-04 00:53:45 +08:00
Xinchen Hui
6dbf431541
Merge branch 'PHP-5.4'
2012-11-02 18:57:56 +08: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
ab1429dd43
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed bug #63241 PHP fails to open Windows deduplicated files.
Conflicts:
NEWS
2012-10-31 23:01:09 +01: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
9acc2367b1
Merge branch 'PHP-5.4'
2012-10-31 19:04:10 +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
Johannes Schlüter
44b1a07d85
Allow setting SHA256 auth public key as option
2012-10-31 16:54:11 +01:00
Andrey Hristov
a0a34f5bca
plug recent leak
2012-10-31 16:13:00 +01:00
Andrey Hristov
f2f380407a
Merge branch 'master' of ssh://git.php.net/php-src
2012-10-31 15:55:04 +01:00
Andrey Hristov
d62bc53a4f
cosmetics
2012-10-31 15:54:45 +01:00
Xinchen Hui
8fb26e76ba
Merge branch 'PHP-5.4'
2012-10-31 11:14:53 +08:00
Xinchen Hui
7886f46b56
Fixed bug #63399 (ReflectionClass::getTraitAliases() incorrectly resolves traitnames)
2012-10-31 11:13:32 +08:00
David Soria Parra
1af3d9d6c9
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
2012-10-30 15:43:56 +01: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