Xinchen Hui
cec1786911
Fixed bug #62938 (zend_do_bind_catch() used without declaration)
2012-08-27 10:23:23 +08: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
dacd11ea89
Fixed cloning in ext/intl classes; master specific
2012-08-26 23:44:54 +02:00
Gustavo Lopes
befe4ab479
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed defective cloning in ext/intl classes
NEWS for commit 72c807a
Allow Spoofchecker to be registered on ICU 49.1
Announce on NEWS change in 1ce572c
2012-08-26 23:42: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
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
011af74b23
Fix version in check message
2012-08-26 23:12:41 +02:00
Gustavo Lopes
949f6cd473
Announce on NEWS change in 1ce572c
2012-08-26 22:01:15 +02:00
Gustavo Lopes
a89c95552c
Merge branch 'PHP-5.4' (merge with strategy ours)
...
Change does not apply to master where the min ICU version is 4.0
* PHP-5.4:
Bug #62933 : compilation error with ICU 3.4
2012-08-26 21:59:17 +02:00
Gustavo Lopes
7179c11066
Merge branch 'PHP-5.4' (early part)
...
* 'PHP-5.4' (early part):
Merging PR 121 to add support for slow request counting on the PHP-FPM status page
2012-08-26 21:59:05 +02:00
Gustavo Lopes
1ce572ce2c
Bug #62933 : compilation error with ICU 3.4
2012-08-26 21:57:53 +02:00
Gustavo Lopes
e95ad46186
Relax 4 dateformat tests for ICU 4.8
2012-08-26 20:42:54 +02:00
Lars Strojny
8788cddfb3
Prefix RESULT_CODE enum with ZEND_
2012-08-26 20:06:47 +02:00
Gustavo Lopes
3d0857938d
zend_binary_strncasecmp_l used w/out declaration
2012-08-26 19:44:05 +02:00
Gustavo Lopes
8831b000ca
Require ICU >= 4.0 in configure
2012-08-26 19:28:22 +02:00
Nikita Popov
48f4096917
Travis: Silence configure and make
...
The large compile logs are hurting the poor browsers.
This also drops two bogus configure options.
2012-08-26 17:46:01 +02:00
Stuart Langley
e3ef84c59b
Strong types for the result codes SUCCESS & FAILURE. These are common
...
symbol names and using #defines can cause conflicts.
2012-08-26 17:15:27 +02:00
Lars Strojny
e7a714b35e
Merging PR 121 to add support for slow request counting on the PHP-FPM status page
2012-08-26 17:09:46 +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
Pierrick Charron
101fd2d3fd
Fix bad version for CURLINFO_CERTINFO
...
CURLINFO_CERTINFO is available since 7.19.1. The cURL extension
allow to use it since this same version but the internal function
create_certinfo used internally for CURLINFO_CERTINFO usage
is only usable for version greater than 7.19.1 which will cause
problem if the user is using the 7.19.1 cURL version
2012-08-26 09:03:45 -04:00
Nikita Popov
d60e3c6ef5
Merge remote-tracking branch 'php-src/master' into addGeneratorsSupport
...
Conflicts:
Zend/zend_language_parser.y
Zend/zend_vm_execute.skl
2012-08-26 13:03:55 +02:00
Xinchen Hui
14c88ff82c
Merge branch 'PHP-5.4'
2012-08-26 18:28:58 +08:00
Xinchen Hui
e24194d157
Add test for #62907
2012-08-26 18:28:15 +08:00
Xinchen Hui
5ebbdecfea
Fixed bug #62930 , and more tests
2012-08-26 13:05:33 +08:00
Xinchen Hui
c6a5d192c8
tabs
2012-08-26 12:27:10 +08:00
Xinchen Hui
7c60aeef85
Fixed bug #62931 & #62932
2012-08-26 11:37:05 +08:00
Nikita Popov
bd70d15588
Remove implementation stubs for yield delegation
...
I decided to leave out yield delegation for an initial proposal, so remove
the stubs for it too.
2012-08-25 19:03:23 +02:00
Nikita Popov
f53225a99e
Fix several issues and allow rewind only at/before first yield
...
* Trying to resume a generator while it is already running now throws a
fatal error.
* Trying to use yield in finally while the generator is being force-closed
(by GC) throws a fatal error.
* Rewinding after the first yield now throws an Exception
2012-08-25 17:40:08 +02:00
Xinchen Hui
35951d4be0
Support list in foreach
...
RFC: https://wiki.php.net/rfc/foreachlist
2012-08-25 22:23:57 +08:00
Xinchen Hui
e888d48d9b
Merge branch 'PHP-5.4'
2012-08-25 21:55:36 +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
Xinchen Hui
326aa08753
Prefer no finally block for most situations
2012-08-25 21:14:51 +08:00
Pierrick Charron
9ab45d3edb
Add missing constants in cURL
2012-08-25 01:21:17 -04:00
Pierrick Charron
e5ff3f18f5
Update bad versions for cURL constants
...
This was updated according to the cURL symbol tables located here :
http://curl.haxx.se/libcurl/c/symbols-in-versions.html
2012-08-24 18:04:16 -04:00
Nikita Popov
4d8edda341
Run finally if generator is closed before finishing
2012-08-24 19:10:09 +02:00
Pierrick Charron
2a2e31d2a5
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed bug #62912 (CURLINFO_PRIMARY_IP is not exposed)
2012-08-24 10:26:44 -04: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
Nikita Popov
7cdf6367a5
Finally with return now works in generators too
2012-08-24 13:52:16 +02:00
Nikita Popov
68c1e1cfe9
Add dedicated opcode for returns from a generator
...
Generators don't have a return value, so it doesn't make sense to have
a shared implementation here.
2012-08-24 13:51:39 +02:00
Nikita Popov
6517ed0215
Merge remote-tracking branch 'php-src/master' into addGeneratorsSupport
...
Conflicts:
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
2012-08-24 13:29:40 +02:00
Xinchen Hui
071580ea1f
Merge branch 'PHP-5.4'
2012-08-24 18:24:55 +08:00
Xinchen Hui
2c74536e6e
Merge branch 'PHP-5.3' into PHP-5.4
2012-08-24 18:22:11 +08:00
Xinchen Hui
55d680e968
better fix
2012-08-24 18:21:49 +08:00
Xinchen Hui
1701460867
Merge branch 'PHP-5.3' into PHP-5.4
...
Conflicts:
ext/phar/tests/phpinfo_003.phpt
2012-08-24 18:20:35 +08:00
Xinchen Hui
7bedd275eb
Fix test
2012-08-24 18:18:38 +08:00
Xinchen Hui
a3d701e11c
Merge branch 'PHP-5.4'
2012-08-23 23:28:24 +08:00
Xinchen Hui
21f085720c
Merge branch 'PHP-5.3' into PHP-5.4
2012-08-23 23:28:02 +08:00