bc9f8030c7
Fixed sockets ext build on win
2012-11-13 14:53:32 +01:00
dae05b2973
Merge branch 'PHP-5.4'
2012-11-13 10:17:21 +00:00
4f36aeb120
Merge branch 'PHP-5.3' into PHP-5.4
...
Conflicts:
NEWS
2012-11-13 10:16:58 +00:00
00ad4c0e6a
- Updated to version 2012.10 (2012j)
2012-11-13 10:15:34 +00:00
1e081a825e
Merge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3
2012-11-13 10:10:41 +00:00
d9aea7cd4d
Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
2012-11-13 10:10:28 +00:00
97f39ee1d7
Merge branch 'master' of git.php.net:/php-src
2012-11-13 10:10:10 +00:00
0b96b4c4e9
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Update arginfo for preg_match_all() to reflect reality.
fix invalid read when trimming empty string
2012-11-12 20:09:18 +08:00
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
4029475e82
fix invalid read when trimming empty string
2012-11-11 22:38:18 +04:00
5b82fb52fd
fix invalid read when trimming empty string
2012-11-11 22:38:14 +04:00
bb60122c2f
fix invalid read when trimming empty string
2012-11-11 22:37:04 +04:00
b936a815fb
Merge branch 'PHP-5.4'
2012-11-07 17:09:27 +08:00
e222837f6e
Merge branch 'PHP-5.3' into PHP-5.4
2012-11-07 17:08:34 +08:00
7fcbe4d546
Fixed bug #63447 (max_input_vars doesn't filter variables when mbstring.encoding_translation = On)
2012-11-07 17:05:24 +08:00
a983ded9bd
Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3
2012-11-05 20:58:04 -08:00
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
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
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
37cc133d6f
Merge branch 'PHP-5.4'
2012-11-04 16:24:07 +00:00
db0f623490
Merge branch 'PHP-5.3' into PHP-5.4
2012-11-04 16:24:02 +00:00
1784279be0
- Updated to version 2012.9 (2012i)
2012-11-04 16:23:58 +00:00
9acc2367b1
Merge branch 'PHP-5.4'
2012-10-31 19:04:10 +01:00
965bd32fec
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-31 18:29:31 +01:00
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
44b1a07d85
Allow setting SHA256 auth public key as option
2012-10-31 16:54:11 +01:00
a0a34f5bca
plug recent leak
2012-10-31 16:13:00 +01:00
f2f380407a
Merge branch 'master' of ssh://git.php.net/php-src
2012-10-31 15:55:04 +01:00
d62bc53a4f
cosmetics
2012-10-31 15:54:45 +01:00
8fb26e76ba
Merge branch 'PHP-5.4'
2012-10-31 11:14:53 +08:00
7886f46b56
Fixed bug #63399 (ReflectionClass::getTraitAliases() incorrectly resolves traitnames)
2012-10-31 11:13:32 +08:00
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
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
d864063a18
Bug #62593 Updated to account for INOUT parameters
2012-10-30 14:32:32 +01:00
d922e801ee
Bug #62593 Updated test to verify bindParam doesn't change original value
2012-10-30 14:32:27 +01:00
646c0e5738
Bug #62593 Updated to always treat zval by value
2012-10-30 14:32:22 +01:00
f0835c002d
Bug #62593 Added test for change
2012-10-30 14:32:16 +01:00
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
cc1caf92ea
Merge branch 'PHP-5.4'
2012-10-30 11:11:22 +08:00
3342e7276c
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-30 11:10:26 +08:00
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
c511ee3d64
Merge branch 'PHP-5.4'
2012-10-27 15:19:59 +01:00
4c08ee069c
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-27 15:19:55 +01:00
b5344e267a
- Updated to version 2012.8 (2012h)
2012-10-27 15:19:54 +01:00
0716ddcdb2
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed bug #63180 (Corruption of hash tables)
fix bug #63369
Conflicts:
NEWS
2012-10-26 09:49:21 -07:00
68b229ea73
Fixed bug #63180 (Corruption of hash tables)
2012-10-26 09:47:30 -07:00
01dee2c4b0
fix bug #63369
...
(un)serialize() leaves dangling pointers, causes crashes
2012-10-26 16:42:21 +04:00
f2bffdc2e4
fix bug #63369
...
(un)serialize() leaves dangling pointers, causes crashes
2012-10-26 16:41:14 +04:00
d21d909072
Merge branch 'PHP-5.4'
2012-10-26 14:23:22 +02:00
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
Anatoliy Belsky