1
0
mirror of https://github.com/php/php-src.git synced 2026-04-21 15:08:16 +02:00
Commit Graph

30108 Commits

Author SHA1 Message Date
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
donnut 53ba768ed8 removed unneccesary arrat and ini settings 2012-07-14 19:22:03 -07:00
donnut 4539d799bb addition SplFileObject tests 2012-07-14 19:21:50 -07:00
donnut 2cb7a678a1 new tests from PHP TestFest June 2012 2012-07-14 19:21:34 -07:00
Stanislav Malyshev 6bfea28ce3 Merge branch 'PHP-5.4'
* PHP-5.4:
  Fixing up closing tag
  Testing variation on input parameters of http_build_query() function
2012-07-14 19:00:35 -07:00
Adam Gegotek 8b70dd202a Fixing up closing tag 2012-07-14 18:59:04 -07:00
Adam Gegotek 152f73f92a Testing variation on input parameters of http_build_query() function 2012-07-14 18:58:52 -07:00
Stanislav Malyshev bbb5eba871 Merge branch 'PHP-5.4'
* PHP-5.4:
  Fixed bug #61964 (finfo_open with directory cause invalid free)
2012-07-14 18:53:30 -07:00
Stanislav Malyshev 1916bb223e Merge branch 'pull-request/91' into PHP-5.4
* pull-request/91:
  Fixed bug #61964 (finfo_open with directory cause invalid free)
2012-07-14 18:52:24 -07:00
Stanislav Malyshev 3b0573363a fix comment 2012-07-14 14:50:50 -07:00
Stanislav Malyshev 582514d4c7 fix for bug#18556 - use simple tolower() function for internal things 2012-07-14 14:50:50 -07:00
Felipe Pena c481a21ea1 Merge branch 'PHP-5.4'
* PHP-5.4:
  - Fixed memory leak when extending DOMXPath
  - BFN
2012-07-14 13:17:09 -03:00
Felipe Pena d640e446ab - Fixed conflict 2012-07-14 13:16:35 -03:00
Felipe Pena 864575251a - Fixed memory leak when extending DOMXPath 2012-07-14 13:13:31 -03:00
Felipe Pena f94051ea11 - Fix conflict 2012-07-14 12:23:24 -03:00
Felipe Pena 0bff7cfadd - Fixed bug #62565 (Crashes due non-initialized internal properties_table) 2012-07-14 12:16:16 -03:00
Felipe Pena 44cdcb7fdb Merge branch 'PHP-5.4'
* PHP-5.4:
  - Fixed bug #62564 (Extending MessageFormatter and adding property causes crash)
2012-07-14 11:37:20 -03:00
Felipe Pena 8b093dee21 - Fixed bug #62564 (Extending MessageFormatter and adding property causes crash) 2012-07-14 11:37:08 -03:00
Anatoliy Belsky afba8b6597 Merge branch 'PHP-5.4'
* PHP-5.4:
  Fixed bug #62379 failing ODBC long column functionality
2012-07-13 15:38:38 +02:00
Matt Ficken 10251b20c3 Fixed bug #62379 failing ODBC long column functionality 2012-07-13 15:34:00 +02:00
Anatoliy Belsky 92bf6391aa Merge branch 'PHP-5.4'
* PHP-5.4:
  Fixed bug #61677 ext\zlib\tests\bug_52944.phpt fails
2012-07-13 11:46:49 +02:00
Anatoliy Belsky d9d21b2037 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed bug #61677 ext\zlib\tests\bug_52944.phpt fails
2012-07-13 11:46:14 +02:00
Anatoliy Belsky 02b8362ec2 Fixed bug #61677 ext\zlib\tests\bug_52944.phpt fails
The test is known to fail on windows with zlib version < 1.2.7 (current dep is 1.2.5),
with 1.2.7 it works. As it's primarily a zlib 1.2.5 issue on windows, skip it for now.
2012-07-13 11:39:57 +02:00
Anatoliy Belsky 9cfb176116 Merge branch 'PHP-5.4'
* PHP-5.4:
  fixed the test for warnings changed
2012-07-12 18:30:09 +02:00