php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-28 02:33:17 +02:00
Code Issues Packages Projects Releases Wiki Activity
71,018 Commits 549 Branches 1,485 Tags
44cdcb7fdbc8756ff669dc7bbccf05e51d12d67f
Commit Graph

71018 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 ec7e479562 reverted news about #62477 2012-07-12 10:57:56 +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 7bd3d0bf8c Merge branch 'PHP-5.4' 
* PHP-5.4:
  updated NEWS
 2012-07-11 22:38:38 +02:00
Anatoliy Belsky be8f089a13 updated NEWS 2012-07-11 22:37:39 +02:00
Anatoliy Belsky 0064722bfa Merge branch 'PHP-5.4' 
* PHP-5.4:
  updated NEWS
 2012-07-11 22:35:29 +02:00
Anatoliy Belsky 899c8f485a Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  updated NEWS
 2012-07-11 22:35:00 +02:00
Anatoliy Belsky 896d0fcd41 updated NEWS 2012-07-11 22:33:42 +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 bf01548967 Add new function hash_pbkdf2() to UGRAPDING doc 2012-07-10 13:13:30 -04: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 b210766084 Merge branch 'PHP-5.4' 2012-07-10 18:46:20 +08:00
Xinchen Hui 977ce78d82 Merge branch 'PHP-5.3' into PHP-5.4 2012-07-10 18:45:16 +08: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
Xinchen Hui 0e97cdf86b Merge branch 'PHP-5.4' 
* PHP-5.4:
  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)
 2012-07-09 08:46:38 +08:00
Xinchen Hui 4323a7aced update NEWS 2012-07-09 08:44:59 +08:00
Xinchen Hui 0398cc22a9 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #62499 (curl_setopt($ch, CURLOPT_COOKIEFILE, "") returns false)
  appease MSVC (doesnt like unary minus of unsigned ints)

Conflicts:
	ext/curl/interface.c
 2012-07-09 08:38:03 +08:00
Xinchen Hui c819cf9d6b Fixed bug #62499 (curl_setopt($ch, CURLOPT_COOKIEFILE, "") returns false) 
this bc break is caused by the fix for #61948
 2012-07-09 08:32:40 +08:00
Nuno Lopes b2b018d5f7 appease MSVC (doesnt like unary minus of unsigned ints) 2012-07-08 15:28:29 -04:00
Nuno Lopes 5910d8d4f4 appease MSVC (doesnt like unary minus of unsigned ints) 2012-07-08 15:21:18 -04:00
Nuno Lopes e6d9cd983b appease MSVC (doesnt like unary minus of unsigned ints) 2012-07-08 15:19:41 -04:00
Felipe Pena a76878cd59 Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Fixed bug #62507 (['REQUEST_TIME'] under mod_php5 returns miliseconds instead of seconds)
 2012-07-08 14:05:42 -03:00
Felipe Pena 2019062cfc - Fixed bug #62507 (['REQUEST_TIME'] under mod_php5 returns miliseconds instead of seconds) 2012-07-08 14:05:28 -03:00
Xinchen Hui 96651f8094 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed Bug #62500 (Segfault in DateInterval class when extended)
 2012-07-09 00:28:04 +08:00
Xinchen Hui e3b9b1e6dc Fixed Bug #62500 (Segfault in DateInterval class when extended) 
This fix also fixed bug #62508  (Segfault while access a non-string
property of DateInterval object)
 2012-07-09 00:25:48 +08:00
Stanislav Malyshev 9aa4851485 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Added in NEWS and UPGRADING for feature 55218
  Adding in test for feature 55218
  Implements feature 55218

Conflicts:
	UPGRADING
 2012-07-07 12:52:35 -07:00
Stanislav Malyshev a213c10ef2 Merge branch 'pull-request/112' into PHP-5.4 
* pull-request/112:
  Added in NEWS and UPGRADING for feature 55218
  Adding in test for feature 55218
  Implements feature 55218
 2012-07-07 12:51:26 -07:00
Lonny Kapelushnik f0df7dbc8f Added in NEWS and UPGRADING for feature 55218 2012-07-07 09:10:08 -04:00
Anthony Ferrara 6abd7365d0 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix two issues with run-tests.php
 2012-07-06 22:39:32 -04:00
Anthony Ferrara 79ed100c19 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix two issues with run-tests.php
 2012-07-06 22:38:15 -04:00