clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-02 07:16:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
71,126 Commits 494 Branches 1,367 Tags 803 MiB
81de111131
Commit Graph

30133 Commits

Author SHA1 Message Date
Florian Anderiasch
81de111131 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Add syslog support to mail.log #62356
 2012-07-24 14:34:41 +02:00
Florian Anderiasch
ddc8d16245 Add syslog support to mail.log #62356 
Patch by Michael Orlitzky
 2012-07-24 14:31:30 +02:00
Florian Anderiasch
45d596ea1e Add optional depth parameter to json_encode #62369 2012-07-24 13:15:16 +02:00
Xinchen Hui
dd9d64b21e Merge branch 'PHP-5.4' 2012-07-24 14:46:25 +08:00
Xinchen Hui
9fe8c58130 binary compatibility 2012-07-24 14:45:13 +08:00
Xinchen Hui
4c1e2bbd6f Re-fix bug #55544 2012-07-24 14:43:53 +08:00
Xinchen Hui
6126ac44b5 correct the author name introduced in bb685512 2012-07-24 13:39:46 +08:00
Xinchen Hui
38fb89f91d Merge branch 'PHP-5.4' 2012-07-24 13:39:02 +08:00
Xinchen Hui
2abc4c2f6f Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 2012-07-24 13:38:11 +08:00
Xinchen Hui
c20b2ab0bd folders 2012-07-24 13:37:44 +08:00
Gustavo Lopes
ae3a827bf9 Leak caused by wrong and unreachable cleanup 2012-07-23 17:00:52 +02:00
Gustavo Lopes
01004c6abb Fixed leak in RuleBasedBreakIterator constructor 
The leak occurred in case of error.
 2012-07-23 16:51:28 +02:00
Gustavo Lopes
d8d5f9a9f5 Fixed function name 2012-07-23 16:46:28 +02:00
Gustavo Lopes
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
Gustavo Lopes
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
Gustavo André dos Santos Lopes
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
Gustavo André dos Santos Lopes
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
Gustavo André dos Santos Lopes
2498c90c71 Readded accidentally removed line 2012-07-22 04:22:23 +02:00
Gustavo André dos Santos Lopes
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
Xinchen Hui
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
Xinchen Hui
0c996613c0 Fixed bug #62616 (ArrayIterator::count() from IteratorIterator instance gives Segmentation fault) 2012-07-21 22:45:16 +08:00
Xinchen Hui
64cbdc606c Merge branch 'PHP-5.4' 2012-07-21 02:58:16 +08:00
Xinchen Hui
a6f1533789 Fixed bug #55544 (ob_gzhandler always conflicts with zlib.output_compression) 2012-07-21 02:57:36 +08:00
Xinchen Hui
94a0f8722b Revert "fix test" 
This reverts commit cea3f0f363.

seems the behavior is different between certain versions
 2012-07-18 22:35:03 +08:00
Xinchen Hui
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
Xinchen Hui
b81b8bf77d this initialization is unnecessary anymore after commit 2d9d2cadad 2012-07-18 21:45:37 +08:00
Xinchen Hui
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
Xinchen Hui
2d9d2cadad Fixed bug #62597 (segfault in php_stream_wrapper_log_error with ZTS build) 2012-07-18 20:16:27 +08:00
Xinchen Hui
2ed4026518 Merge branch 'PHP-5.4' 
* PHP-5.4:
  skip for ZTS
 2012-07-18 19:48:27 +08:00
Xinchen Hui
11d0558928 skip for ZTS 2012-07-18 19:47:54 +08:00
Xinchen Hui
44462955f8 Merge branch 'PHP-5.4' 
* PHP-5.4:
  fix test (dos2unix, typo)
 2012-07-18 19:25:56 +08:00
Xinchen Hui
282a6659aa fix test (dos2unix, typo) 2012-07-18 19:25:22 +08:00
Xinchen Hui
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
41a9c681a0 fix test, the key may be a float value 2012-07-18 19:21:25 +08:00
Xinchen Hui
8238c6a4c8 test script for bug #61697 2012-07-18 19:19:31 +08:00
Xinchen Hui
f13288de96 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #62594 (segfault in mysqlnd_res_meta::set_mode)
 2012-07-18 19:06:58 +08:00
Xinchen Hui
25be12a3bc Fixed bug #62594 (segfault in mysqlnd_res_meta::set_mode) 2012-07-18 19:06:27 +08:00
Xinchen Hui
cea3f0f363 fix test 
All input characters that are not a-z, A-Z or 0-9 will be converted to their "URL escaped" version

see http://curl.haxx.se/libcurl/c/curl_escape.html
 2012-07-18 18:50:42 +08:00
Gustavo André dos Santos Lopes
08302e3d03 Merge branch '5.4' 
* 5.4:
  NEWS for b47d6b32
  Fix test fails: ext/standard/tests/general_functions/bug27678.phpt
 2012-07-17 23:13:43 +02:00
Reeze Xia
b47d6b32ba Fix test fails: ext/standard/tests/general_functions/bug27678.phpt 
After commit 3e62aae1, number_format() returns string with length,
but _php_math_number_format_ex_len() didn't set string length
on nan and inf. This cause segfault when destruct the return value.
 2012-07-17 23:08:11 +02:00
Xinchen Hui
6d10bdff9f Merge branch 'PHP-5.4' 
* PHP-5.4:
  Update libmagic.patch
 2012-07-15 18:27:29 +08:00
Xinchen Hui
c8f285d190 Update libmagic.patch 2012-07-15 18:25:58 +08:00
Stanislav Malyshev
026c161caf Merge branch 'PHP-5.4' 
* PHP-5.4:
  Implemented FR #61602 Allow access to name of constant used as default value
 2012-07-14 23:10:00 -07:00
Stanislav Malyshev
f4809424cd Merge branch 'pull-request/96' into PHP-5.4 
* pull-request/96:
  Implemented FR #61602 Allow access to name of constant used as default value
 2012-07-14 23:08:50 -07:00
Stanislav Malyshev
e84c5be631 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #61527 (Recursive/ArrayIterator gives misleading notice when array empty or moved to the end)
 2012-07-14 22:35:47 -07:00
Stanislav Malyshev
a5d45bae85 Fixed bug #61527 (Recursive/ArrayIterator gives misleading notice when array empty or moved to the end) 2012-07-14 22:34:28 -07:00
Stanislav Malyshev
05f4e3e52a Merge branch 'PHP-5.4' 
* PHP-5.4:
  Typofix in test-description
 2012-07-14 22:08:27 -07:00
Stanislav Malyshev
cfdccdb805 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Typofix in test-description
 2012-07-14 22:08:19 -07:00
Jille Timmermans
86b4252c8e Typofix in test-description 2012-07-14 22:07:50 -07:00
Stanislav Malyshev
455f3de802 Merge branch 'PHP-5.4' 
* PHP-5.4:
  removed unneccesary arrat and ini settings
  addition SplFileObject tests
  new tests from PHP TestFest June 2012
 2012-07-14 19:25:16 -07:00