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
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
Xinchen Hui
e54970aaf1
Unused variable copystr
...
copystr is declared again blow
2012-11-21 12:30:03 +08: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
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
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
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
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
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
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
Xinchen Hui
7886f46b56
Fixed bug #63399 (ReflectionClass::getTraitAliases() incorrectly resolves traitnames)
2012-10-31 11:13:32 +08: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
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
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
68b229ea73
Fixed bug #63180 (Corruption of hash tables)
2012-10-26 09:47:30 -07: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
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
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
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
e3ac418309
enabled libxpm for gd on windows
2012-10-24 10:36:52 +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
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
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
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
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
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
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
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
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
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
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
Xinchen Hui
36c10242cd
Remove meaningless md5 string && Attempt to fix #63184
2012-09-29 14:38:29 +08: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
Anatoliy Belsky
6a50a8640c
fix unix/win dir separators
2012-09-27 19:52:34 +02: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
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
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
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
Rob Richards
ffa72707c8
fix bug #63015 (Incorrect arginfo for DOMErrorHandler)
2012-09-20 02:34:07 -04: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
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
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
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
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
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
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
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
Xinchen Hui
328a3d9f13
regenerate patch, and save a strlen
2012-09-11 11:43:47 +08:00
Xinchen Hui
0a25a0241e
Fix the wrong use of snprintf which is introduced in 1d2f619049
2012-09-10 23:08:54 +08: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
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
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
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
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
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
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
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
863e7e0acb
Merge branch 'PHP-5.3' into PHP-5.4
...
Conflicts:
ext/spl/spl_array.c
2012-09-01 14:27:09 +08:00
Xinchen Hui
67d7d03f00
Fixed bug #62987 (Assigning to ArrayObject[null][something] overrides all undefined variables)
...
The get_zval_ptr_ptr of spl_array handler should act as same as the vm's
2012-09-01 14:21:34 +08:00
Lars Strojny
e658a91b3d
assert() user message
...
Added 2nd, optional, param to assert. When passed in it will be added
to the printed warnings and passed as a 4th param to a callback. PR 150
by Lonny Kapelushnik
2012-08-31 19:04:53 +02:00
Stanislav Malyshev
8b3c1a380a
fix bug #55856 : preg_replace should fail on trailing garbage
2012-08-28 21:59:20 -07:00
Gustavo Lopes
0410b4e60f
Fixed defective cloning in ext/intl classes
...
See also bug #62915
Cherry picked from 886a50a
(I forgot about 5.3)
Conflicts:
ext/intl/spoofchecker/spoofchecker_class.c
ext/intl/transliterator/transliterator_class.c
2012-08-26 23:53:57 +02:00
Gustavo Lopes
886a50a619
Fixed defective cloning in ext/intl classes
...
See also bug #62915
2012-08-26 23:42:13 +02:00
Gustavo Lopes
72c807ad67
Allow Spoofchecker to be registered on ICU 49.1
2012-08-26 23:39:04 +02:00
Gustavo Lopes
1ce572ce2c
Bug #62933 : compilation error with ICU 3.4
2012-08-26 21:57:53 +02:00
Pierrick Charron
4c83ecc754
Fixed bug #62912 (CURLINFO_PRIMARY_IP is not exposed)
...
CURLINFO_PRIMARY_* and CURLINFO_LOCAL_* where available in curl_getinfo
but the constant itself was not exposed to php userland
2012-08-24 10:16:40 -04:00
Xinchen Hui
55d680e968
better fix
2012-08-24 18:21:49 +08:00
Xinchen Hui
7bedd275eb
Fix test
2012-08-24 18:18:38 +08:00
Derick Rethans
bc602495d7
Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
2012-08-24 10:56:03 +02:00
Derick Rethans
e5bfcd340a
Merge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3
2012-08-24 10:55:17 +02:00
Xinchen Hui
13bcf685cb
Fixed bug #62904 (Crash when cloning an object which inherits SplFixedArray)
2012-08-23 23:27:16 +08:00
Xinchen Hui
42f91d6ac6
Fixed bug #62904 (Crash when cloning an object which inherits SplFixedArray)
2012-08-23 23:21:25 +08:00
Anatoliy Belsky
9a72b52a1f
fixing test for upcoming mpir upgrade
...
- mpir is going to be upgraded up to 2.5.1 on windows
2012-08-23 17:09:45 +02:00
Anatoliy Belsky
eca4fc6991
ZTS fix introduced by Felipe must also go into 5.3
2012-08-23 13:32:06 +02:00
Gustavo André dos Santos Lopes
d212a5d391
Fix SPOOFCHECKER_METHOD_FETCH_OBJECT definition
2012-08-23 10:32:05 +01:00
Felipe Pena
b98fc4379f
- Fixed ZTS build
2012-08-22 19:39:57 -03:00
Gustavo Lopes
cd1f45b3be
Fix handling of several uinitialized intl objects
...
PHP 5.4 specific changes. Not having this in the merge commit helps
porting to pecl/intl
2012-08-22 22:38:31 +02:00
Gustavo Lopes
87803ace94
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix handling of several uinitialized intl objects
2012-08-22 22:37:52 +02:00
Gustavo Lopes
a5d0c1e21b
Fix handling of several uinitialized intl objects
2012-08-22 22:32:51 +02:00
Felipe Pena
7a56ac00a0
- Fixed bug #62892 (ReflectionClass::getTraitAliases crashes on importing trait methods as private)
2012-08-22 10:50:50 -03:00
Xinchen Hui
4e561055a4
Merge branch 'PHP-5.3' into PHP-5.4
2012-08-22 13:49:04 +08:00
Xinchen Hui
e5bdd2c0ee
Fixed bug #62885 (mysqli_poll - Segmentation fault)
2012-08-22 13:41:47 +08:00
Felipe Pena
b0dbf71466
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
- Removed PHP 6 checks
2012-08-21 20:15:48 -03:00
Felipe Pena
85fa4d7747
- Removed PHP 6 checks
2012-08-21 20:15:34 -03:00
Xinchen Hui
cd34067aec
skip test properly
2012-08-21 22:15:54 +08:00
Xinchen Hui
60ad16e11f
skip test properly
2012-08-21 22:11:22 +08:00
Anatoliy Belsky
d304527253
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Added test for bug #51353 . It'll be skipped by default and must be activated manually.
2012-08-21 13:24:54 +02:00
Anatoliy Belsky
92153dcfe3
Added test for bug #51353 . It'll be skipped by default and must be
...
activated manually.
2012-08-21 13:22:00 +02:00
Lars Strojny
7b6ebd97e7
Merge branch 'PHP-5.4' of git://github.com/php/php-src into PHP-5.4
2012-08-21 10:09:23 +02:00
Lars Strojny
aaa2eee4c0
Bug 62462: adjusting test
2012-08-21 10:09:05 +02:00
Xinchen Hui
c1284f21a7
Merge branch 'PHP-5.3' into PHP-5.4
2012-08-21 15:23:09 +08:00
Reeze Xia
0cdc1f5626
Move test files to tests dir
...
There are 7 files duplicated, so those files was deleted
2012-08-21 14:32:39 +08:00
Xinchen Hui
8722173ad5
Implemented FR #62840 (Add sort flag to ArrayObject::ksort)
2012-08-21 13:32:15 +08:00
Lars Strojny
c54d73d54c
Bug 62462: Prevent multibyte characters from being split between the lines
...
Merged from https://github.com/php/php-src/pull/120
2012-08-20 23:46:50 +02:00
Xinchen Hui
cc5631eca3
Merge branch 'PHP-5.3' into PHP-5.4
2012-08-20 23:44:21 +08:00
Popa Adrian Marius
b9a050100c
skip test for bug 43130 on firebird , not relevant
2012-08-20 16:56:37 +03:00
Andrew Faulds
4ec29b945c
relative-scheme
2012-08-19 22:16:07 -07:00
Andrew Faulds
36b88d77f2
bug #62844 ; relative URL schemes in parse_url()
2012-08-19 22:15:58 -07:00
Felipe Pena
13768f8650
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
- Value stored to var is never used
2012-08-19 15:09:18 -03:00
Felipe Pena
f4054afe40
- Value stored to var is never used
2012-08-19 15:09:14 -03:00
Felipe Pena
d6e6db4501
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
- Value stored to var is never used
2012-08-19 14:50:52 -03:00
Felipe Pena
3dd256a67b
- Value stored to var is never used
2012-08-19 14:50:49 -03:00
Felipe Pena
9d8d84ebdf
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
- Value stored to var is never used
2012-08-19 14:34:42 -03:00
Felipe Pena
50ab6c63a7
- Value stored to var is never used
2012-08-19 14:34:38 -03:00
Felipe Pena
2497bb97e7
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
- Value stored to var is never used
2012-08-19 12:55:43 -03:00
Felipe Pena
6cd0e446dd
- Value stored to var is never used
2012-08-19 12:55:38 -03:00
Felipe Pena
6513ca85c2
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
- Value stored to var is never read
2012-08-19 12:13:59 -03:00
Felipe Pena
dc1138b102
- Value stored to var is never read
2012-08-19 12:13:48 -03:00
Xinchen Hui
8693bae624
Merge branch 'PHP-5.3' into PHP-5.4
2012-08-19 18:33:37 +08:00
Reeze Xia
46a3f25772
Fixed bug #62852 (Unserialize invalid DateTime causes crash)
2012-08-19 17:57:45 +08:00
Anatoliy Belsky
15e31d5720
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
More intl tests extracted from symfony
2012-08-17 20:31:00 +02:00
Matt Ficken
1a23d42909
More intl tests extracted from symfony
2012-08-17 20:29:08 +02:00
Xinchen Hui
0b23da1c74
Fixed bug #62836 (Seg fault or broken object references on unserialize())
2012-08-17 18:28:32 +08:00
Pierrick Charron
8ac61a3e60
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #62839
2012-08-16 14:50:06 -04:00
Pierrick Charron
9cf0139460
Fixed bug #62839
...
curl_copy_handle segfault with CURLOPT_FILE. The refcount was incremented
before the assignement.
2012-08-16 14:48:44 -04:00
Antony Dovgal
b5494c5f17
Merge commit '8649e42' into PHP-5.4
...
* commit '8649e42':
Fixed bug #62838
2012-08-16 14:34:32 +04:00
Antony Dovgal
8649e4236b
Fixed bug #62838
...
enchant_dict_quick_check() destroys zval, but fails to initialize it
2012-08-16 14:32:55 +04:00
Christopher Jones
c9265b1acd
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix skipifs
2012-08-14 14:13:03 -07:00
Christopher Jones
6524a530df
Fix skipifs
...
Skipifs were referencing an unset variable
2012-08-14 14:10:20 -07:00
Christopher Jones
2b934dfdf9
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Small test tidy up
2012-08-14 11:45:24 -07:00
Christopher Jones
8c3bf96022
Small test tidy up
...
Make some test changes so the tests can be run with the CLI webserver
2012-08-14 11:41:36 -07:00
Xinchen Hui
1a527397cc
better fix & this test pass now
2012-08-15 01:25:31 +08:00
Xinchen Hui
8848778a59
Merge fix e7535e06e6
to 5.3
...
thanks for reeze.xia@gmail.com notice this
2012-08-15 01:06:10 +08:00
Xinchen Hui
a5a409ebff
Fixed bug (segfault due to retval is not initialized)
2012-08-15 00:44:47 +08:00
Xinchen Hui
9be55beb91
Attempt to fix segfault due to retval is not initialized
2012-08-15 00:31:57 +08:00
Xinchen Hui
b2fe342d04
improve the fix
2012-08-15 00:25:06 +08:00
Xinchen Hui
da3660a4c4
Fixed bug (segfault due to PS(mod_user_implemented) not be reseted when closing handler call exit)
2012-08-15 00:15:34 +08:00
Nikita Popov
49e91151c0
Merge branch 'PHP-5.3' into PHP-5.4
2012-08-14 17:37:10 +02:00
Nikita Popov
e1c610fb44
Fix exif test failure
...
There are two slightly different error messages for invalid pointers, so
make the pattern slightly less strict to account for both.
2012-08-14 17:33:38 +02:00
Xinchen Hui
8091256948
Merge branch 'PHP-5.3' into PHP-5.4
2012-08-14 14:03:05 +08:00
Xinchen Hui
da14cdd6f3
Merge branch 'skip-memory-exhaust-tests' of https://github.com/reeze/php-src into PHP-5.3
2012-08-14 13:58:15 +08:00
Nikita Popov
f19351b503
Merge branch 'PHP-5.3' into PHP-5.4
2012-08-13 22:06:18 +02:00
Nikita Popov
7aed239050
Ask for less random data in mcrypt_create_iv
...
Otherwise the RNG blocks and the test takes a lot of time to run (and
occasionally fails).
2012-08-13 22:01:19 +02:00
Nikita Popov
9bc1af1e58
Rename mcrypt_cbf -> mcrypt_cfb
...
Also fix ECB -> CFB in the initialization vector size call (not that it
makes a difference, they have the same size).
2012-08-13 22:01:03 +02:00
Xinchen Hui
212cfb95d1
more test script for #62328
2012-08-13 11:03:35 +08:00
Xinchen Hui
dda0565b53
Merge branch 'PHP-5.3' into PHP-5.4
2012-08-12 20:58:45 +08:00
Xinchen Hui
4970926e45
Fixed bug #62763 (register_shutdown_function and extending class)
2012-08-12 20:58:09 +08:00
Xinchen Hui
7b307fb930
Fixed bug #62328 (implementing __toString and a cast to string fails)
...
__toString should has a high priority
2012-08-12 11:50:28 +08:00
Reeze Xia
0239437903
Skip tests reply on Zend MM turned on
...
Those two tests have expect memory exhausted fatal error
2012-08-11 00:34:37 +08:00
Xinchen Hui
5ae7540abd
Merge branch 'PHP-5.3' into PHP-5.4
2012-08-11 00:24:12 +08:00
Xinchen Hui
7130887719
Fix test, from PR 158
2012-08-11 00:22:52 +08:00
Rob Richards
c5a611b257
Merge branch 'PHP-5.3' into PHP-5.4
...
# By Daniel Veillard
* PHP-5.3:
Update to work with libxml 2.9.0
2012-08-09 14:24:50 -04:00
Daniel Veillard
c4b26cc1b0
Update to work with libxml 2.9.0
2012-08-09 14:02:33 -04:00
Stanislav Malyshev
c98a51a169
Merge branch 'bug40459' into PHP-5.4
...
* bug40459:
News for bug#40459
fix bug #40459 - make all stream funcs that create object call ctor
2012-08-09 00:10:31 -07:00
Stanislav Malyshev
4db70fd406
fix bug #40459 - make all stream funcs that create object call ctor
2012-08-07 22:59:12 -07:00
Anatoliy Belsky
55b82abe00
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Added the intl tests extracted from Symfony. These are making the intl ext crash with ICU at least 4.6, but probably with earlier versions too.
2012-08-06 14:12:04 +02:00
Matt Ficken
ed793b2a3f
Added the intl tests extracted from Symfony. These are making the intl ext crash with ICU at least 4.6, but probably with earlier versions too.
2012-08-06 14:07:42 +02:00
Derick Rethans
de59314a60
Merge branch 'PHP-5.3' into PHP-5.4
2012-08-06 12:59:39 +01:00
Derick Rethans
0a2833bbef
- Updated to version 2012.5 (2012e)
2012-08-06 12:59:38 +01:00
Lonny Kapelushnik
45f3322905
var_export outputs an E_WARNING when recursion is detected
2012-08-05 20:56:06 -07:00
Brett Bieber
82bc8821f9
Minor spelling corrections
2012-08-05 20:43:22 -07:00
Xinchen Hui
228c288686
Fix 126 tests failed of phar when --enable-zend-multibyte
2012-08-05 12:40:59 +08:00