Reeze Xia
57bebfcbdc
fixed test for bug #52944 also for darwin
2012-09-09 23:02:50 +02:00
Dmitry Stogov
6ba376f552
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
- Fixed bug #61767 (Shutdown functions not called in certain error situation) - Fixed bug #60909 (custom error handler throwing Exception + fatal error = no shutdown function)
Conflicts:
NEWS
Zend/zend_object_handlers.c
2012-09-06 12:14:29 +04:00
Dmitry Stogov
b29dc146b9
- Fixed bug #61767 (Shutdown functions not called in certain error situation)
...
- Fixed bug #60909 (custom error handler throwing Exception + fatal error = no shutdown function)
2012-09-06 11:26:40 +04:00
Xinchen Hui
a43c45ea7d
Merge branch 'PHP-5.3' into PHP-5.4
2012-09-05 23:48:27 +08: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
b9dec59b07
Merge branch 'PHP-5.3' into PHP-5.4
2012-09-05 23:42:45 +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
Pierre Joye
954e7a3b3c
- 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
2012-09-05 13:00:04 +02:00
Dmitry Stogov
6c0508f8d5
Fixed bug #62907 (Double free when use traits)
2012-09-05 09:58:22 +04: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
0ab27c35a4
Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice).
2012-09-03 11:51:08 +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
d371a306a2
Merge branch 'PHP-5.4' of git://github.com/php/php-src into PHP-5.4
2012-09-02 14:53:52 +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
Xinchen Hui
069c448623
folder
2012-09-02 16:52:53 +08:00
Lars Strojny
89948c7fbe
Initializing optional argument description in assert()
2012-09-02 08:01:32 +02:00
Stanislav Malyshev
f7d51df5c6
fix NEWS
2012-09-01 16:57:29 -07: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
Xinchen Hui
66fad45724
Merge branch 'PHP-5.3' into PHP-5.4
2012-08-31 11:24:10 +08:00
Xinchen Hui
5dc2cef370
Fixed bug #62976 (Notice: could not be converted to int when comparing some builtin classes)
2012-08-31 11:22:43 +08:00
Felipe Pena
8afb848e18
- BFN
2012-08-30 09:33:35 -03:00
Felipe Pena
eb8d603d46
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
- Fixed bug #62955 (Only one directive is loaded from "Per Directory Values" Windows registry)
2012-08-30 09:32:26 -03:00
Felipe Pena
de884997e0
- Fixed bug #62955 (Only one directive is loaded from "Per Directory Values" Windows registry)
2012-08-30 09:32:13 -03:00
Anatoliy Belsky
677de8568a
updated mpir version
2012-08-29 17:49:02 +02:00
Gustavo André dos Santos Lopes
521ab78788
Merge 5.3 with strategy ours
...
* origin/PHP-5.3:
Fixed defective cloning in ext/intl classes
2012-08-29 14:30:47 +01:00
Stanislav Malyshev
55b3386a81
update version id too
2012-08-28 22:10:34 -07:00
Stanislav Malyshev
78cffe0c4d
5.4.7 branched
2012-08-28 22:07:08 -07:00
Stanislav Malyshev
8b3c1a380a
fix bug #55856 : preg_replace should fail on trailing garbage
2012-08-28 21:59:20 -07:00
Lars Strojny
f82dd2c774
Bug #62956 : fixing private method signature validation
...
In inheritance, if both methods are private, don not enforce the same
signature.
2012-08-28 14:06:18 +02: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
c11106734d
NEWS for 886a50a
2012-08-26 23:47:00 +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
63a1801d19
NEWS for commit 72c807a
2012-08-26 23:39:53 +02:00
Gustavo Lopes
72c807ad67
Allow Spoofchecker to be registered on ICU 49.1
2012-08-26 23:39:04 +02:00
Gustavo Lopes
949f6cd473
Announce on NEWS change in 1ce572c
2012-08-26 22:01:15 +02:00
Gustavo Lopes
1ce572ce2c
Bug #62933 : compilation error with ICU 3.4
2012-08-26 21:57:53 +02:00
Lars Strojny
8e7081f3ac
Merging PR 121 to add support for slow request counting on the PHP-FPM status page
2012-08-26 17:02:39 +02:00
Xinchen Hui
e24194d157
Add test for #62907
2012-08-26 18:28:15 +08:00
Xinchen Hui
383eafe482
Merge branch 'PHP-5.3' into PHP-5.4
2012-08-25 21:50:08 +08:00
Xinchen Hui
d92a89fe52
Fixed bug (segfault while build with zts and GOTO vm-kind)
2012-08-25 21:47:53 +08:00