php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-21 15:08:16 +02:00
Code Issues Packages Projects Releases Wiki Activity
71,055 Commits 547 Branches 1,483 Tags
626effcf1736f7f14e1c01ec52d62a55cf70cd9d
Commit Graph

30091 Commits

Author SHA1 Message Date
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
Anatoliy Belsky cf91b163e1 fixed the test for warnings changed 2012-07-12 18:24:38 +02:00
Anatoliy Belsky ed1f5b4dae Merge branch 'PHP-5.4' 
* PHP-5.4:
  reverted news about #62477
  reverted changes for #62477

Conflicts:
	NEWS
 2012-07-12 11:02:33 +02:00
Anatoliy Belsky 86428169d3 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  reverted changes for #62477
 2012-07-12 10:57:26 +02:00
Anatoliy Belsky ad7eeba3c1 reverted changes for #62477 2012-07-12 10:54:14 +02:00
Anatoliy Belsky b530d6d790 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #62477 LimitIterator int overflow
 2012-07-11 22:30:40 +02:00
Anatoliy Belsky 40f8010a13 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #62477 LimitIterator int overflow
 2012-07-11 22:29:45 +02:00
Anatoliy Belsky b383ddf1e5 Fixed bug #62477 LimitIterator int overflow 2012-07-11 22:25:31 +02:00
Anatoliy Belsky 6071bfb325 fix windows build 
- there should be no trailing white spaces after \ in multiline macros
 2012-07-11 13:32:19 +02:00
Anthony Ferrara 731c6fd274 Merge remote branch 'upstream/master' into hash_pbkdf2 
* upstream/master: (101 commits)
  Fixed Bug #62500 (Segfault in DateInterval class when extended)
  Fixed test bug #62312 (warnings changed one more time)
  fix valgrind warning
  fix valgrind warning
  fixed #62433 test for win
  update NEWS
  Fixed bug #62499 (curl_setopt($ch, CURLOPT_COOKIEFILE, "") returns false)
  appease MSVC (doesnt like unary minus of unsigned ints)
  appease MSVC (doesnt like unary minus of unsigned ints)
  appease MSVC (doesnt like unary minus of unsigned ints)
  - Fixed bug #62507 (['REQUEST_TIME'] under mod_php5 returns miliseconds instead of seconds)
  Fixed Bug #62500 (Segfault in DateInterval class when extended)
  Added in NEWS and UPGRADING for feature 55218
  Fix two issues with run-tests.php
  Fix potential integer overflow in nl2br
  Fix potential integer overflow in bin2hex
  This wil be PHP 5.3.16
  Revert change 3f3ad30c50: There shouldn't be new features in 5.3, especially not if they aren't in 5.4, too.
  fix (signed) integer overflow (part of bug #52550
  fix (signed) integer overflow (part of bug #52550
  ...
 2012-07-10 10:31:25 -04:00
Xinchen Hui bcf5853eaa Fixed Bug #62500 (Segfault in DateInterval class when extended) 2012-07-10 18:43:11 +08:00
Anatoliy Belsky 64604350f5 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed test bug #62312 (warnings changed one more time)
  fix valgrind warning

Conflicts:
	ext/mysqlnd/mysqlnd.c
 2012-07-09 18:51:27 +02:00
Anatoliy Belsky 97b8798520 Fixed test bug #62312 (warnings changed one more time) 2012-07-09 18:21:51 +02:00
andrey 049abdfb26 fix valgrind warning 2012-07-09 18:13:35 +03:00
andrey 66e1ac23c1 Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4 2012-07-09 17:59:42 +03:00
andrey 555db7dc4e fix valgrind warning 2012-07-09 17:59:23 +03:00
Anatoliy Belsky f76bb14814 Merge branch 'PHP-5.4' 
* PHP-5.4:
  fixed #62433 test for win
 2012-07-09 12:45:56 +02:00
Anatoliy Belsky 2032470e41 fixed #62433 test for win 2012-07-09 12:42:10 +02:00