Anatoliy Belsky
bc910a7ce4
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed test for bug #63297
2012-11-22 19:05:31 +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
David Soria Parra
c733f28bd9
Add myself to QA
2012-11-21 18:42:01 +01:00
Xinchen Hui
6b0299aafc
Merge branch 'PHP-5.4' into PHP-5.5
2012-11-21 12:30:54 +08:00
Xinchen Hui
e54970aaf1
Unused variable copystr
...
copystr is declared again blow
2012-11-21 12:30:03 +08:00
Xinchen Hui
aba80d09e6
Update credits for 5.5
2012-11-21 12:17:41 +08:00
Pierrick Charron
30d659144a
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from value
2012-11-16 18:08:19 -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
Anatoliy Belsky
36fadde72c
Fixed ext/intl/tests/timezone_createDefault_basic.phpt
...
Timezone offsets can be negative
2012-11-15 14:31:55 +01:00
Anatoliy Belsky
f85ae48f4f
Fixed ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt
...
There is a constant now which only is there when mysqli with
mysqlnd and pdo_mysql was compiled at the same time, or when
libmysql version > 50605. So checking for that dynamically,
will fail only if there is no mysqli and no connection.
2012-11-14 21:18:16 +01:00
Anatoliy Belsky
bc9f8030c7
Fixed sockets ext build on win
2012-11-13 14:53:32 +01:00
Derick Rethans
dae05b2973
Merge branch 'PHP-5.4'
2012-11-13 10:17:21 +00: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
Derick Rethans
97f39ee1d7
Merge branch 'master' of git.php.net:/php-src
2012-11-13 10:10:10 +00:00
Adam Harvey
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
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
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
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
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
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
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
cc1caf92ea
Merge branch 'PHP-5.4'
2012-10-30 11:11:22 +08: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
c511ee3d64
Merge branch 'PHP-5.4'
2012-10-27 15:19:59 +01: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
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
Dmitry Stogov
68b229ea73
Fixed bug #63180 (Corruption of hash tables)
2012-10-26 09:47:30 -07:00
Antony Dovgal
01dee2c4b0
fix bug #63369
...
(un)serialize() leaves dangling pointers, causes crashes
2012-10-26 16:42:21 +04: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
d21d909072
Merge branch 'PHP-5.4'
2012-10-26 14:23:22 +02: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
5d4c691e51
Merge branch 'PHP-5.4'
...
* PHP-5.4:
This won't make the test pass but now its at least one that shows no unnecessary error messages...
2012-10-26 12:32:39 +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
John Jawed (JJ)
f68f31f121
Notice if CURLOPT_SSL_VERIFYHOST is set to true
2012-10-25 16:00:02 -04:00
Anthony Ferrara
18da63e5be
Merge in fix for bug 63363 (CURL silently accepts boolean true for SSL_VERIFYHOST
...
Merge in a fix to raise a notice when a boolean true is passed into curl_setopt for CURLOPT_SSL_VERIFYHOST.
2012-10-25 15:30:37 -04:00
John Jawed (JJ)
3b85d09de7
Notice if CURLOPT_SSL_VERIFYHOST is set to true
2012-10-25 12:22:23 -07:00
Anatoliy Belsky
071f217388
Merge branch 'PHP-5.4'
...
* PHP-5.4:
enabled libxpm for gd on windows
2012-10-24 10:37:23 +02:00
Anatoliy Belsky
e3ac418309
enabled libxpm for gd on windows
2012-10-24 10:36:52 +02:00
ULF WENDEL
7c00017671
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
commented out the HHC_LOCATION line, as there are no easy to use alternatives for hhc.exe on linux. we should either run the chm build on a windows box(maybe on the replacement of oti1), or look into running it through wine see http://cweiske.de/tagebuch/Generating%20CHM%20files%20with%20Wine%20on%20a%20Linux%20server,%20and%20a%20bit%20about%20PEAR's%20PhD%20transition.htm for details. I also set DOT_CLEANUP to NO as the doc generation was spitting out errors regarding some dot file cannot be found.
2012-10-23 15:14:59 +02:00
Ferenc Kovacs
240f8d06de
commented out the HHC_LOCATION line, as there are no easy to use alternatives for
...
hhc.exe on linux.
we should either run the chm build on a windows box(maybe on the replacement of oti1),
or look into running it through wine see
http://cweiske.de/tagebuch/Generating%20CHM%20files%20with%20Wine%20on%20a%20Linux%20server,%20and%20a%20bit%20about%20PEAR's%20PhD%20transition.htm
for details.
I also set DOT_CLEANUP to NO as the doc generation was spitting out errors regarding some dot
file cannot be found.
2012-10-25 17:11:13 +02:00
ULF WENDEL
b8595e1d40
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fix for bug #62820
2012-10-23 15:14:45 +02: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
Anatoliy Belsky
f962260081
merged changes for bug #63297 from 5.3
2012-10-25 09:40:21 +02:00
Anatoliy Belsky
6e23cfeba4
fixed a typo in the error message
2012-10-25 09:26:44 +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
b48e163c35
enabled libxpm for gd on windows
2012-10-24 10:26:27 +02:00
ULF WENDEL
e7fc671dc0
Deprecating undocumented function alias, related to bug #63295
2012-10-23 12:02:58 +02:00
Gustavo Lopes
e7e57aea0a
Use if_nametoindex in Vista
...
I missed this instance in bf19838c
.
2012-10-23 11:52:31 +02:00
Anatoliy Belsky
f734c0a7ca
Merge branch 'PHP-5.4'
...
* PHP-5.4:
merged changes for bug #63297 from 5.3
Conflicts:
NEWS
2012-10-25 09:42:18 +02:00
Andrey Hristov
91ce3764f0
Merge branch 'master' of ssh://git.php.net/php-src
2012-10-22 14:36:16 +02:00
Andrey Hristov
27e0999843
fix crashes in newly introduced macros when normal trace is disabled but
...
memory traced is enabled.
2012-10-22 14:35:35 +02:00
Christopher Jones
0afca66958
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Re-fixed bug #60901 (Improve "tail" syntax for AIX installation)
2012-10-21 22:22:07 -07: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
8b0704618f
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed bug #63284 PCRE upgrade to 8.31
2012-10-19 09:52:43 +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
6444eef27b
Update libmagic.patch
2012-10-19 11:14:14 +08:00
Christopher Jones
25ebd50553
Merge branch 'PHP-5.4'
...
* PHP-5.4:
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:58:36 -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
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
51fe5bcd09
Merge branch 'PHP-5.4'
2012-10-18 21:53:08 +01: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
Xinchen Hui
0d7965f0a3
Merge the fix for #61964 to 5.3, which will fix #63304
2012-10-18 23:29:33 +08:00
Andrey Hristov
8219b02579
Merge branch 'master' of ssh://git.php.net/php-src
2012-10-18 15:15:32 +02:00
Andrey Hristov
967a1ebe51
add protection against core dumps if the underlying library returns
...
0x0 for some reason
2012-10-18 15:09:17 +02:00
Xinchen Hui
9714ceb92b
Merge branch 'PHP-5.4'
2012-10-18 20:14:54 +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
84efca62ff
Merge branch 'PHP-5.4'
2012-10-18 20:12:00 +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
4eece4c86a
Merge branch 'PHP-5.4'
2012-10-18 17:35:29 +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
Johannes Schlüter
82fb5df380
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-17 18:26:27 +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
Andrey Hristov
d62702851c
fix build with libmysql on Ubuntu 12.04 x64 probably other mixed 32/64 systems
2012-10-17 16:35:36 +02:00
Andrey Hristov
54cbf5315c
Merge branch 'master' of ssh://git.php.net/php-src
2012-10-16 15:06:22 +02:00
Andrey Hristov
b0e8fb6489
fix newly introduced segfault
2012-10-16 15:06:02 +02:00
Xinchen Hui
1b9e0de2cc
Remove executable permission on inc
2012-10-10 10:44:34 +08:00
Xinchen Hui
610c7fbe7b
Remove executable permission on phpt
2012-10-10 10:27:49 +08:00
Xinchen Hui
6284ef112e
Fixed bug #63236 (Executable permission on various source files)
2012-10-09 13:28:31 +08:00
Xinchen Hui
45e0d452c5
Fixed bug #63235 (buffer overflow in use of SQLGetDiagRec)
2012-10-09 13:13:51 +08: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
Anatoliy Belsky
92a46fe07e
reverted the previous fix for libpng include
2012-10-02 09:57:44 +02:00
Anatoliy Belsky
0165eec1ea
fixed include checks for libpng under win
2012-10-02 09:39:34 +02:00
Xinchen Hui
4f860a4412
Avoding superfluous function call
2012-10-02 00:28:38 +08:00
Xinchen Hui
af0c22537a
Add test for #35895
2012-10-02 00:27:35 +08:00
ULF WENDEL
1fafc9b373
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Cover have_ssl=NO and have_ssl=DISABLED
2012-09-29 18:56:30 +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
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
917639d463
Updating expected output in anticipation of mysqlnd_auth.c path
2012-09-29 17:42:00 +02:00
Anatoliy Belsky
3c89f8507f
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed bug #63248 Load multiple magic files on win
Conflicts:
NEWS
2012-10-16 11:14:11 +02:00
Anthony Ferrara
9aacdf6e89
Merging in Password Hashing API into master
...
This implements the accepted RFC password_hash https://wiki.php.net/rfc/password_hash
2012-10-16 04:11:37 -04:00
Anthony Ferrara
0bc9ca39ce
Refactor to using a stack based zval instead of dynamic allocation
2012-10-07 05:42:08 -04:00
Anthony Ferrara
37b2207f66
Clean up unreported memory leak by switching to zval_ptr_dtor
2012-10-07 05:12:02 -04:00
Anthony Ferrara
76e83f769f
fix allocation and copy issue
2012-10-06 12:33:48 -04:00
Anthony Ferrara
1751d5fabe
Really fix leaks, add test cases to prove it...
2012-10-06 10:38:41 -04:00
Anthony Ferrara
25b2d364e9
Fix issue with possible memory leak
2012-10-05 15:53:40 -04:00
Anthony Ferrara
4a7d18c79e
Fix some double free issues, and more cleanup work
2012-10-05 15:31:58 -04:00
ULF WENDEL
ccf749e38d
Merge branch 'PHP-5.4'
...
* PHP-5.4:
- BFN
Minor changes for MySQL 5.6
NEWS for 76601c4
2012-09-29 12:21:55 +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
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
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
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
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
e4a8fa6a15
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-09 13:29:51 +08:00
Xinchen Hui
931571260b
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-09 13:15:18 +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
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
Anatoliy Belsky
26e492f2f3
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
reverted the previous fix for libpng include
2012-10-02 10:00:09 +02:00
Anatoliy Belsky
45351eaab4
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
fixed include checks for libpng under win
2012-10-02 09:40:42 +02:00
Xinchen Hui
60a280936e
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-02 00:30:49 +08:00
Xinchen Hui
139ac42bec
Fixed bug #63184 test (ext/spl/tests/RecursiveDirectoryIterator_getSubPathname_basic.phpt failed)
2012-10-01 22:42:22 +08:00
Stanislav Malyshev
40bb9254c5
Merge branch 'pull-request/210' into PHP-5.4
...
* pull-request/210:
Fix bugs 62561,62896 (Modifying DateTime::__construct,date_create adds an hour) Prevent a unix timestamp, which is always GMT when being parsed, from taking on the local timezones DST flag.
2012-09-30 20:19:36 -07:00
Remi Collet
79db2855f7
Bug #63147 : SKIP_ONLINE_TESTS, for getmxrr
2012-09-30 19:40:52 -07:00
Remi Collet
71c61921f3
Bug #63147 : introduce SKIP_ONLINE_TESTS, for gethostbyname
2012-09-30 19:40:43 -07:00
Remi Collet
189b99aee1
gethostbyname_basic002.phpt is a duplicate to gethostbyname_error004.phpt
2012-09-30 19:40:36 -07:00
Stanislav Malyshev
bf064112b7
fix test and move to proper place
2012-09-30 19:24:42 -07:00
husman
491b1efacb
Bug #63162 - parse_url does not matches password component
2012-09-30 19:20:37 -07:00
Xinchen Hui
175a9de47f
Fix test
2012-10-01 00:15:47 +08:00
Lonny Kapelushnik
b3469560f3
Fix bugs 62561,62896 (Modifying DateTime::__construct,date_create adds an hour)
...
Prevent a unix timestamp, which is always GMT when being parsed, from taking on
the local timezones DST flag.
2012-09-30 04:31:29 +00:00
ULF WENDEL
20e76f4487
Minor changes for MySQL 5.6
2012-09-29 12:10:24 +02:00
ULF WENDEL
4969c7d50a
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
- 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
sapi/litespeed/lsapi_main.c: Fix bug #63228
fix test
constify
Fixed bug #63258 (seg fault with PDO and dblib using DBSETOPT(H->link, DBQUOTEDIDENT, 1))
2012-09-29 09:56:55 +02:00
Felipe Pena
5cf6334e84
Merge branch 'PHP-5.4'
...
* PHP-5.4:
- Fixed bug #63214 (Large PDO Firebird Queries)
2012-10-12 19:43:00 -03:00
Gustavo Lopes
2634f55992
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fix bug #63240 on stream_get_line()
2012-10-12 20:24:28 +02:00
Anatoliy Belsky
a4c964ca7b
Merge branch 'PHP-5.4'
...
* PHP-5.4:
fixed tests for gd having freetype >= 2.4.10
2012-10-12 19:38:49 +02:00
Andrey Hristov
6fbcf69375
fix test
2012-10-12 10:35:45 +02:00
Andrey Hristov
0f3fb08a8d
Merge branch 'master' of ssh://git.php.net/php-src
2012-10-12 10:20:37 +02:00
Andrey Hristov
225792c5db
constify
2012-10-12 10:20:09 +02:00
Xinchen Hui
d709442faf
Merge branch 'PHP-5.4'
2012-10-12 10:39:20 +08:00
Anatoliy Belsky
e70aed5c74
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fix warnings preventing this test from passing
2012-10-10 11:06:34 +02:00
Xinchen Hui
4e5e8c9da0
Merge branch 'PHP-5.4'
2012-10-10 10:45:34 +08:00
Xinchen Hui
b17039c737
Remove executable permission on phpt
2012-10-10 10:32:58 +08:00
Xinchen Hui
4b152e5470
Merge branch 'PHP-5.4'
2012-10-10 10:32:38 +08:00
Xinchen Hui
75a2c0d715
Merge branch 'PHP-5.4'
2012-10-09 13:30:22 +08:00
Xinchen Hui
14bfd3126c
Merge branch 'PHP-5.4'
2012-10-09 13:16:53 +08:00
Anatoliy Belsky
d5494d5e24
Merge branch 'PHP-5.4'
...
* PHP-5.4:
exposing the libxpm version in phpinfo
5.4.9-dev
Conflicts:
NEWS
configure.in
main/php_version.h
2012-10-04 18:24:42 +02:00
Derick Rethans
61bee020e1
Merge branch 'master' of git.php.net:/php-src
2012-10-04 08:38:56 +01:00
Andrey Hristov
06dfb96bf5
add a check for libmysql
2012-10-03 14:14:59 +02:00
Andrey Hristov
3262de2f62
Merge branch 'master' of ssh://git.php.net/php-src
2012-10-03 14:03:05 +02:00
Andrey Hristov
4c9e222f99
if ssl has been switched on transmit clear-text password
2012-10-03 14:02:33 +02:00
Anatoliy Belsky
eea88c58db
Merge branch 'PHP-5.4'
...
* PHP-5.4:
reverted the previous fix for libpng include
2012-10-02 10:03:03 +02:00
Anatoliy Belsky
6d1f81ebc0
Merge branch 'PHP-5.4'
...
* PHP-5.4:
fixed include checks for libpng under win
2012-10-02 09:41:24 +02:00
Xinchen Hui
62fa875f3e
Merge branch 'PHP-5.4'
2012-10-02 00:31:47 +08:00
Xinchen Hui
a81d431068
Merge branch 'PHP-5.4'
2012-10-01 22:45:15 +08:00
Stanislav Malyshev
e3e3fba66d
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fix bugs 62561,62896 (Modifying DateTime::__construct,date_create adds an hour) Prevent a unix timestamp, which is always GMT when being parsed, from taking on the local timezones DST flag.
2012-09-30 20:21:11 -07:00
Stanislav Malyshev
4ba2d546c8
Merge branch 'PHP-5.4'
...
* PHP-5.4:
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
2012-09-30 19:41:54 -07:00
Stanislav Malyshev
815248d8fb
Merge branch 'PHP-5.4'
...
* PHP-5.4:
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
fix news
2012-09-30 19:28:42 -07:00
Xinchen Hui
f8d1fc62fa
Merge branch 'PHP-5.4'
2012-10-01 00:17:11 +08:00
ULF WENDEL
a2098ca9eb
SHA256 authentication tests
2012-09-29 09:47:23 +02:00
Xinchen Hui
d6ca1c9b9a
Merge branch 'PHP-5.4'
2012-09-29 14:39:59 +08:00
Xinchen Hui
36c10242cd
Remove meaningless md5 string && Attempt to fix #63184
2012-09-29 14:38:29 +08:00
Pierrick Charron
02bdf4c1fc
Merge branch 'PHP-5.4'
...
* PHP-5.4:
FD_ZERO file descriptors before calling curl_multi_fdset
2012-09-28 15:22:37 -04:00
Pierrick Charron
a2a8220127
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
FD_ZERO file descriptors before calling curl_multi_fdset
2012-09-28 15:21:33 -04:00
Pierrick Charron
936553d666
FD_ZERO file descriptors before calling curl_multi_fdset
...
As per curl documentation http://curl.haxx.se/libcurl/c/curl_multi_fdset.html
we need to FD_ZERO file descriptors before calling the curl_multi_fdset function
2012-09-28 15:21:03 -04:00
Andrey Hristov
5a385487c2
Merge branch 'master' of ssh://git.php.net/php-src
2012-09-28 11:59:20 +02:00
Andrey Hristov
c540fe2064
fix login failure with empty password. This is 5.5 specific - new code
2012-09-28 11:58:41 +02:00
Anatoliy Belsky
87df717909
Merge branch 'PHP-5.4'
...
* PHP-5.4:
fix unix/win dir separators
2012-09-27 19:54:12 +02:00
Anatoliy Belsky
6a50a8640c
fix unix/win dir separators
2012-09-27 19:52:34 +02:00
andrey
da96aa848f
compile out example plugin in a release build
2012-09-26 17:13:46 +02:00
andrey
263b37bee1
change public key setting to PERDIR and finish code that allows
...
to set the key file programatically per mysqli_options()
2012-09-25 18:26:02 +02:00
andrey
6074df91c6
remove old unicode code, that is was compiled out by using a macro
2012-09-25 16:36:21 +02:00
andrey
571b46bff6
Add SHA256 authentication support - password hashing to mysqlnd
...
Automatic switchover to SSL with plain-text password is not part of this
2012-09-25 14:04:36 +02:00
Xinchen Hui
8a930c93dd
Merge branch 'PHP-5.4'
2012-09-24 19:47:47 +08:00
Xinchen Hui
8cdd6bc1e7
Merge branch 'PHP-5.3' into PHP-5.4
2012-09-24 19:47:28 +08:00
Xinchen Hui
2cbc4053ae
Correct the test summary
2012-09-24 19:46:40 +08:00
Xinchen Hui
518fa8c4cf
Merge branch 'PHP-5.4'
2012-09-24 11:01:24 +08:00
Xinchen Hui
d9ad532050
Merge branch 'PHP-5.3' into PHP-5.4
...
Conflicts:
ext/standard/tests/general_functions/bug60723.phpt
2012-09-24 11:00:58 +08:00
Xinchen Hui
923511d364
Fixed bug #60723 (error_log error time has changed to UTC ignoring default timezo)
...
Cherry pick to 5.3
2012-09-24 10:59:06 +08:00
Xinchen Hui
8fcb4f1107
Merge branch 'PHP-5.4'
2012-09-23 23:00:15 +08:00
Xinchen Hui
395d77c540
Fixed bug #60723 (error_log error time has changed to UTC ignoring default timezo)
2012-09-23 22:59:31 +08:00
Pierrick Charron
6c135dff97
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Avoid calling select if maxfd returned by curl_multi_fdset is -1
Fixing NEWS file
2012-09-22 10:19:16 -04:00
Pierrick Charron
c8687ee63b
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Avoid calling select if maxfd returned by curl_multi_fdset is -1
2012-09-22 10:18:44 -04:00
Pierrick Charron
2e8ab65270
Avoid calling select if maxfd returned by curl_multi_fdset is -1
...
As per libcurl documentation :
When libcurl returns -1 in max_fd, it is because libcurl currently
does something that isn't possible for your application to monitor
with a socket and unfortunately you can then not know exactly when
the current action is completed using select().
2012-09-22 10:15:40 -04:00
Pierrick Charron
70713a27b6
Add CURLOPT_READDATA which was removed by mistake
...
I did a check and this is the only one which was removed by mistake.
No other constants are available in 5.4 branch and not in master
2012-09-22 10:05:52 -04:00
Gustavo Lopes
bf19838c87
Do not disable RFC3678 multicast API on Windows
...
The API is supported since Windows Vista and requires targeting Vista
when compiling PHP. Pierre had asked to disable this by default, even
when targeting Vista/Windows Server 2008.
Since XP will not be supported anymore on php-next, any rationale
for this option will not apply anymore.
2012-09-20 23:36:20 +02:00
Rob Richards
4b9ed49217
Merge branch 'PHP-5.4'
...
* PHP-5.4:
fix bug #63015 (Incorrect arginfo for DOMErrorHandler)
2012-09-20 02:35:16 -04:00
Rob Richards
ffa72707c8
fix bug #63015 (Incorrect arginfo for DOMErrorHandler)
2012-09-20 02:34:07 -04:00
Lars Strojny
1c423601a8
Merge branch 'PHP-5.4'
...
Conflicts:
ext/sockets/multicast.h
2012-09-19 22:23:22 +02:00
Lars Strojny
188c124a57
Bug #63000 : MCAST_JOIN_GROUP on OSX is broken
...
The multicast support in PHP 5.4 makes use of MCAST_JOIN_GROUP if it is present.
The problem is that OSX 10.7 added the constant, but did not correctly implement
the feature. This causes the setsockopt call to fail.
The solution to the problem is to not use MCAST_JOIN_GROUP on OSX.
For reference, this was also done in VLC:
* http://trac.videolan.org/vlc/ticket/6104#comment:19
2012-09-19 22:17:35 +02:00
Lars Strojny
6793e09a4e
Merge branch 'PHP-5.4'
2012-09-18 23:17:31 +02:00
Lars Strojny
ee172ce3cc
Merging PR #116
2012-09-18 23:15:03 +02:00
Anatoliy Belsky
3ad033ffba
split tests for the new zlib version on win
2012-09-18 09:59:49 +02:00
Xinchen Hui
26ee1cb0b1
Merge branch 'PHP-5.4'
2012-09-18 10:50:24 +08:00
Xinchen Hui
e2d1eecf99
Merge branch 'PHP-5.3' into PHP-5.4
2012-09-18 10:48:16 +08:00
Xinchen Hui
e66a5ce56f
Fixed Bug #63103 (ext\curl\tests\bug62839.phpt broken)
2012-09-18 10:46:58 +08:00
Stanislav Malyshev
44e3a9be7e
Merge branch 'PHP-5.4'
...
* PHP-5.4:
update news
Support building PHP with the native client toolchain.
test should fail
2012-09-17 15:58:48 -07:00
Anthony Ferrara
8bd79d1807
Refactor slightly to enable cleaner readability
2012-09-17 11:43:47 -04:00
Anthony Ferrara
6fd5ba5c8d
Fix arg info for required params passed to needs_rehash
2012-09-17 11:10:59 -04:00
Anthony Ferrara
44c2624f8c
Fix ucwords error casing
2012-09-17 10:59:51 -04:00
Anthony Ferrara
e034a46bdc
A bunch of naming convention fixes. No functionality changes
2012-09-17 10:52:07 -04:00
Xinchen Hui
6096988704
Merge branch 'PHP-5.3' into PHP-5.4
2012-09-17 11:21:14 +08:00
Xinchen Hui
eb881a1dd1
test should fail
2012-09-17 11:20:24 +08:00
Stanislav Malyshev
088640adb2
Merge branch 'PHp-5.4'
...
* PHp-5.4:
news for bug #61421
commit for php bug 61421 enabling SHA2 and RMD160 for openssl signature verification
2012-09-15 23:02:44 -07:00
Mark Jones
84202c367e
commit for php bug 61421
...
enabling SHA2 and RMD160 for openssl signature verification
2012-09-15 22:59:34 -07:00
Xinchen Hui
d23f9194b1
Merge branch 'PHP-5.4'
2012-09-15 11:33:26 +08:00
Xinchen Hui
2eff69f402
Merge branch 'PHP-5.3' into PHP-5.4
2012-09-15 11:32:08 +08:00
Xinchen Hui
1b13ff6ec7
Add XFAIL test for bug #62852
2012-09-15 11:29:47 +08:00
Xinchen Hui
e766f85405
Revert "Fixed bug #62852 (Unserialize invalid DateTime causes crash)"
...
see: http://news.php.net/php.bugs/173451
This reverts commit 46a3f25772
.
2012-09-15 11:26:21 +08:00
Derick Rethans
7101e9161c
Merge branch 'PHP-5.4'
2012-09-14 09:38:36 +01: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
Christopher Jones
b7fa9bfc04
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Change package.xml fix description
Fixed bug #60901 (Improve "tail" syntax for AIX installation)
2012-09-13 22:45:54 -07:00
Christopher Jones
3b38d14caf
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Change package.xml fix description
Fixed bug #60901 (Improve "tail" syntax for AIX installation)
2012-09-13 22:44:12 -07:00
Christopher Jones
9f44844d7c
Change package.xml fix description
2012-09-13 22:43:10 -07:00
Christopher Jones
bbf5978e26
Fixed bug #60901 (Improve "tail" syntax for AIX installation)
2012-09-13 22:40:55 -07:00
Anthony Ferrara
83cfff4593
Switch to using an ENUM for algorithms instead of a constant
2012-09-13 10:32:54 -04:00
Anthony Ferrara
7ec80e1a13
Fix incorrect arg info required param count for password_hash
2012-09-12 12:15:33 -04:00
Anthony Ferrara
3e383dc0d5
Merge remote branch 'upstream/master' into hash_password
...
* upstream/master:
Generators & UPGRADING
Capitalize the warning message
Rearrange the codes, remove empty lines
Provide a specific error message if date.timezone value is invalid.
regenerate patch, and save a strlen
Fix the wrong use of snprintf which is introduced in 1d2f619049
Fixed unintendent clearance of PHP_OUTPUT_ACTIVATED flag
Fix doc bug #63032 (Number of release in documentation).
fixed test for bug #52944 also for darwin
-enable VC11 (vc2012)
- Fixed bug #61767 (Shutdown functions not called in certain error situation) - Fixed bug #60909 (custom error handler throwing Exception + fatal error = no shutdown function)
year++
correct PHP version & year++
Correct PHP version
year++
- fix build, there was no tsrm context there, doing a fetch but this is horribly slow, this fix needs improvement (or simply add a TSRM context in the signature in master
- fix build, declarations must be 1st in a contextgit checkout -f master
Fixed bug #62907 (Double free when use traits)
Fixed bug #62991 (Segfault with generator and closure)
2012-09-12 11:48:45 -04:00
Anthony Ferrara
76f3295cdf
Expose PASSWORD_BCRYPT_DEFAULT_COST constant and update test to use it
2012-09-12 11:47:50 -04:00
Anthony Ferrara
e9a7bde829
Switch test to using strict comparison for crypt fallback
2012-09-12 11:37:56 -04:00
Anthony Ferrara
e8b7f5b35d
Add tests for password_get_info and password_needs_rehash
2012-09-12 11:21:08 -04:00
Xinchen Hui
f6000a01e2
Capitalize the warning message
2012-09-11 18:09:47 +08:00
Xinchen Hui
79e6635cb6
Rearrange the codes, remove empty lines
2012-09-11 18:02:19 +08:00
Xinchen Hui
0146efbd41
Merge branch 'invalid-timezone' of https://github.com/simonwelsh/php-src
2012-09-11 17:58:20 +08:00
Simon Welsh
e06c47ca2a
Provide a specific error message if date.timezone value is invalid.
2012-09-11 21:45:09 +12:00
Xinchen Hui
7e64681740
Merge branch 'PHP-5.4'
2012-09-11 11:44:33 +08:00
Xinchen Hui
328a3d9f13
regenerate patch, and save a strlen
2012-09-11 11:43:47 +08:00
Xinchen Hui
b5c2f532af
Merge branch 'PHP-5.4'
2012-09-10 23:11:28 +08:00
Xinchen Hui
0a25a0241e
Fix the wrong use of snprintf which is introduced in 1d2f619049
2012-09-10 23:08:54 +08:00
Anatoliy Belsky
b815676494
Merge branch 'PHP-5.4'
...
* PHP-5.4:
fixed test for bug #52944 also for darwin
2012-09-09 23:03:47 +02:00
Reeze Xia
57bebfcbdc
fixed test for bug #52944 also for darwin
2012-09-09 23:02:50 +02:00
Xinchen Hui
94582f9398
year++
...
missed the .re files in 5.3
2012-09-05 23:47:51 +08:00
Xinchen Hui
d22f18007f
Merge branch 'PHP-5.4'
2012-09-05 23:44:41 +08:00
Xinchen Hui
a3d078bd8f
correct PHP version & year++
2012-09-05 23:43:59 +08:00
Xinchen Hui
5f9023ca38
Correct PHP version
2012-09-05 23:41:42 +08:00
Xinchen Hui
63d9c1f40b
Merge branch 'PHP-5.4'
...
Conflicts:
sapi/litespeed/lsapi_main.c
2012-09-05 23:20:42 +08:00
Xinchen Hui
9d44ff640c
Merge branch 'PHP-5.3' into PHP-5.4
...
Conflicts:
ext/interbase/interbase.rc
2012-09-05 23:11:19 +08:00
Xinchen Hui
d64d9e3351
year++
2012-09-05 23:08:05 +08:00
Anthony Ferrara
db41f9fe60
Refactoring to use size_t instead of int most places
2012-09-04 11:34:00 -04:00
Anthony Ferrara
824f1f4581
Merge remote branch 'upstream/master' into hash_password
...
* upstream/master: (393 commits)
forked two tests for windows
Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice)
Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice).
Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice).
Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice)
Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice)
Bug #49510 : Boolean validation fails with FILTER_NULL_ON_FAILURE with empty string or false
Implemented ReflectionFunction::isGenerator()
Allow null as a default value for length in mb_substr() and mb_strcut()
Allow null as a default value for length in mb_substr() and mb_strcut()
folder
Initializing optional argument description in assert()
Initializing optional argument description in assert()
Fix test failed due to new Token T_YIELD
fix NEWS
Fix leak when yielding array as key
Drop obsolete test
Remove extra blank in notice message, should act as same as vm
Fixed bug #62987 (Assigning to ArrayObject[null][something] overrides all undefined variables)
assert() user message
...
2012-09-04 10:29:22 -04:00
Anatoliy Belsky
4b206126ac
Merge branch 'PHP-5.4'
...
* PHP-5.4:
forked two tests for windows
2012-09-03 13:48:02 +02:00
Anatoliy Belsky
ff0aa24054
forked two tests for windows
...
* bug55544.phpt - VT vs. EXT at the start of the data block,
but the data can still be decoded correctly
* bug_52944.phpt works with the corrupted data and has some
different out
Most likely the ASM optimization under windows is responsible
for this behaviour.
2012-09-03 13:37:34 +02:00
Dmitry Stogov
2659f5e88e
Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice)
2012-09-03 11:52:42 +04:00
Dmitry Stogov
33db8c0ef6
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice).
2012-09-03 11:51:17 +04:00
Dmitry Stogov
485c09a376
Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice).
2012-09-03 11:49:58 +04:00
Dmitry Stogov
38476a1543
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice)
2012-09-03 11:47:59 +04:00
Dmitry Stogov
7e816c0921
Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice)
2012-09-03 11:46:47 +04:00
Dmitry Stogov
4cca6241e0
Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice)
2012-09-03 11:38:08 +04:00
Lars Strojny
6fc2962b9a
Merge branch 'PHP-5.4'
2012-09-02 22:11:47 +02:00
Lars Strojny
a26390ef0c
Bug #49510 : Boolean validation fails with FILTER_NULL_ON_FAILURE with empty string or false
2012-09-02 22:10:23 +02:00
Nikita Popov
cdb9fe99c2
Merge remote-tracking branch 'reeze/add-reflection-isGenerator'
2012-09-02 17:40:23 +02:00
Reeze Xia
ad0da9ae60
Implemented ReflectionFunction::isGenerator()
2012-09-02 23:29:56 +08:00
Lars Strojny
352a1956b6
Allow null as a default value for length in mb_substr() and mb_strcut()
2012-09-02 15:02:26 +02:00
Lars Strojny
133f610bb1
Allow null as a default value for length in mb_substr() and mb_strcut()
2012-09-02 14:52:05 +02:00
Lars Strojny
89948c7fbe
Initializing optional argument description in assert()
2012-09-02 08:01:32 +02:00
Lars Strojny
e212de4a44
Initializing optional argument description in assert()
2012-09-02 08:01:18 +02:00
Xinchen Hui
4e84f72554
Fix test failed due to new Token T_YIELD
2012-09-02 13:15:23 +08:00
Gustavo Lopes
53351d087d
Merge branch 'generators'
...
* generators: (70 commits)
Fix typos
Fix segfault when traversing a by-ref generator twice
Make sure that exception is thrown on rewind() after closing too
Remove implementation stubs for yield delegation
Fix several issues and allow rewind only at/before first yield
Run finally if generator is closed before finishing
Finally with return now works in generators too
Add dedicated opcode for returns from a generator
Disallow serialization and unserialization
Fix zts build (typo)
Drop Generator::close() method
Forgot to add test
Support trivial finally in generators (no yield, no return)
Fix implementation of Iterator interface
Add T_YIELD in tokenizer_data.c
Throw error also for return occuring before yield
Fix throwing of exceptions within a generator
Remove reference restrictions from foreach
Require parenthesis around yield expressions
Add some more tests
...
2012-09-01 19:07:20 +02:00
Xinchen Hui
7b5960b085
Merge branch 'PHP-5.4'
2012-09-01 14:38:33 +08:00
Xinchen Hui
f3108b5f81
Remove extra blank in notice message, should act as same as vm
2012-09-01 14:37:45 +08:00
Xinchen Hui
59e34bad32
Merge branch 'PHP-5.4'
2012-09-01 14:27:59 +08:00
Xinchen Hui
863e7e0acb
Merge branch 'PHP-5.3' into PHP-5.4
...
Conflicts:
ext/spl/spl_array.c
2012-09-01 14:27:09 +08:00