dd9d64b21e
Merge branch 'PHP-5.4'
2012-07-24 14:46:25 +08:00
9fe8c58130
binary compatibility
2012-07-24 14:45:13 +08:00
4c1e2bbd6f
Re-fix bug #55544
2012-07-24 14:43:53 +08:00
6126ac44b5
correct the author name introduced in bb685512
2012-07-24 13:39:46 +08:00
38fb89f91d
Merge branch 'PHP-5.4'
2012-07-24 13:39:02 +08:00
2abc4c2f6f
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2012-07-24 13:38:11 +08:00
c20b2ab0bd
folders
2012-07-24 13:37:44 +08:00
ae3a827bf9
Leak caused by wrong and unreachable cleanup
2012-07-23 17:00:52 +02:00
01004c6abb
Fixed leak in RuleBasedBreakIterator constructor
...
The leak occurred in case of error.
2012-07-23 16:51:28 +02:00
d8d5f9a9f5
Fixed function name
2012-07-23 16:46:28 +02:00
c052b9c99a
Do not fetch default locale once on minit or rinit
...
The default locale is now requested to ICU when it's needed by using
intl_get_default_locale().
2012-07-23 16:38:27 +02:00
0dfcc3e798
Add ini setting intl.explicit_cleanup
...
This is to help with looking for leaks. If set to true, this ini
setting forces a call to u_cleanup() on module shutdown.
2012-07-23 16:36:24 +02:00
f3f824823d
Duplicate test for ICU 49
...
The output in ICU < 49 actually seems wrong here; ICU 49 seems to
fix the data.
2012-07-23 02:08:12 +02:00
f43e4f9883
Merge branch 'PHP-5.4'
2012-07-22 23:30:06 +02:00
860b3ffe75
Fix Bug #62612 readline extension compilation fails
2012-07-22 23:28:32 +02:00
a3c8429131
Merge branch 'PHP-5.4'
2012-07-22 22:46:21 +02:00
254d299d07
Merge branch 'PHP-5.3' into PHP-5.4
2012-07-22 22:46:09 +02:00
ffa8461bfe
merge 5.3.15 NEWS
2012-07-22 22:45:39 +02:00
f89dbe5dea
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Improve error message for ssl request
2012-07-22 19:25:54 +08:00
a88eca53f7
Improve error message for ssl request
2012-07-22 19:20:23 +08:00
4203e0a5df
Reflect changes made in merge 99e48d3
2012-07-22 04:26:49 +02:00
99e48d3a57
Merge branch 'datefmt_tz_cal_interop'
...
* datefmt_tz_cal_interop:
Readded accidentally removed line
Added IntlDateFormatter::formatObject(). Refactor
Refactored internal_get_timestamp()
Unified zval -> UDate conversions
2012-07-22 04:22:48 +02:00
2498c90c71
Readded accidentally removed line
2012-07-22 04:22:23 +02:00
2f0775b999
Added IntlDateFormatter::formatObject(). Refactor
...
To better support IntlCalendar, added this function:
string IntlDateFormatter::formatObject(IntlCalendar|DateTime $obj [,
array|int|string $format = null [, string $locale = null).
$format is either of the constants IntlDateFormatter::FULL, etc., in
which case this format applies to both the date and the time, an array
in the form array($dateFormat, $timeFormat), or a string with the
SimpleDateFormat pattern.
This uses both the Calendar type and the timezone of the passed object
to configure the formatter (a GregorianCalendar is forced for
DateTime).
Some stuff was moved around and slighlt modified to allow for more code
reuse.
2012-07-22 04:22:23 +02:00
11a5afec22
Merge branch 'PHP-5.4'
...
* PHP-5.4:
missed the test script
2012-07-21 23:34:13 +08:00
fd50bf2085
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
missed the test script
2012-07-21 23:33:24 +08:00
777b6679a4
missed the test script
2012-07-21 23:30:32 +08:00
3447fe4e04
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fix test failed
Fixed bug #62616 (ArrayIterator::count() from IteratorIterator instance gives Segmentation fault)
2012-07-21 23:29:51 +08:00
52d8779c43
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix test failed
Fixed bug #62616 (ArrayIterator::count() from IteratorIterator instance gives Segmentation fault)
2012-07-21 23:27:52 +08:00
ead076bac6
Fix test failed
2012-07-21 23:27:09 +08:00
cc30524c89
Fixed bug #62616 (ArrayIterator::count() from IteratorIterator instance gives Segmentation fault)
2012-07-21 23:26:18 +08:00
a580405f38
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed bug #62616 (ArrayIterator::count() from IteratorIterator instance gives Segmentation fault)
2012-07-21 22:46:14 +08:00
0c996613c0
Fixed bug #62616 (ArrayIterator::count() from IteratorIterator instance gives Segmentation fault)
2012-07-21 22:45:16 +08:00
64cbdc606c
Merge branch 'PHP-5.4'
2012-07-21 02:58:16 +08:00
a6f1533789
Fixed bug #55544 (ob_gzhandler always conflicts with zlib.output_compression)
2012-07-21 02:57:36 +08:00
b39c0749ac
Merge branch 'PHP-5.4'
2012-07-21 00:48:34 +08:00
a2a1cef1a2
Merge branch 'PHP-5.3' into PHP-5.4
2012-07-21 00:47:54 +08:00
683b4f7a2b
merge 9eb5cb6571 to 5.3
2012-07-21 00:46:32 +08:00
94a0f8722b
Revert "fix test"
...
This reverts commit cea3f0f363
2012-07-18 22:35:03 +08:00
da7cd966ff
Merge branch 'PHP-5.4'
...
* PHP-5.4:
this initialization is unnecessary anymore after commit 2d9d2cadad
2012-07-18 21:49:46 +08:00
b81b8bf77d
this initialization is unnecessary anymore after commit 2d9d2cadad
2012-07-18 21:45:37 +08:00
e7535e06e6
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed bug #62597 (segfault in php_stream_wrapper_log_error with ZTS build)
2012-07-18 20:17:42 +08:00
2d9d2cadad
Fixed bug #62597 (segfault in php_stream_wrapper_log_error with ZTS build)
2012-07-18 20:16:27 +08:00
401230c7e1
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fix test (no charset outputed)
2012-07-18 19:50:59 +08:00
8f89cfb548
Fix test (no charset outputed)
2012-07-18 19:50:30 +08:00
2ed4026518
Merge branch 'PHP-5.4'
...
* PHP-5.4:
skip for ZTS
2012-07-18 19:48:27 +08:00
11d0558928
skip for ZTS
2012-07-18 19:47:54 +08:00
44462955f8
Merge branch 'PHP-5.4'
...
* PHP-5.4:
fix test (dos2unix, typo)
2012-07-18 19:25:56 +08:00
282a6659aa
fix test (dos2unix, typo)
2012-07-18 19:25:22 +08:00
ecc960e862
Merge branch 'PHP-5.4'
...
* PHP-5.4:
fix test, the key may be a float value
2012-07-18 19:22:13 +08:00
Xinchen Hui