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
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
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