clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-02 15:26:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
68,827 Commits 494 Branches 1,367 Tags 807 MiB
f3f824823d
Commit Graph

68827 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatoliy Belsky
cf91b163e1 fixed the test for warnings changed 2012-07-12 18:24:38 +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
be8f089a13 updated NEWS 2012-07-11 22:37:39 +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
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
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
97b8798520 Fixed test bug #62312 (warnings changed one more time) 2012-07-09 18:21:51 +02: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
2032470e41 fixed #62433 test for win 2012-07-09 12:42:10 +02: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
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
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
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
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
Anthony Ferrara
26b37f1792 Fix two issues with run-tests.php 
1. E_STRICT error due to passing return of array_intersect() into reset() directly
2. Details in junit output can produce invalid UTF-8 and XML due to unescaped characters
 2012-07-06 22:37:50 -04:00
Nikita Popov
5cf2f87fa7 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix potential integer overflow in nl2br
  Fix potential integer overflow in bin2hex

Conflicts:
	ext/standard/string.c
 2012-07-05 20:59:18 +02:00
Nikita Popov
157ddd9577 Fix potential integer overflow in nl2br 
The buffer size was calculated manually, thus creating integer overflows
for very large inputs, e.g. nl2br(str_repeat("\n", 613566757)).

The code now uses safe_emalloc, thus making the code throw an error
instead of crashing.
 2012-07-05 20:41:54 +02:00
Nikita Popov
88f46b162b Fix potential integer overflow in bin2hex 
The code was already using safe_emalloc but did the multiplication in
the first argument, thus making the use of safe_emalloc pretty useless.

The *2 is now moved to the second argument.
 2012-07-05 20:14:49 +02:00
Johannes Schlüter
9a38ca8d50 Merge branch 'PHP-5.3' into PHP-5.4 2012-07-05 01:18:57 +02:00
Johannes Schlüter
6b2b195267 This wil be PHP 5.3.16 2012-07-05 01:15:27 +02:00
johannes
bcc87ba68e Revert change 3f3ad30c50: There shouldn't be new features in 5.3, especially 
not if they aren't in 5.4, too.
 2012-07-05 00:55:47 +02:00
Nuno Lopes
91ce8041a3 fix (signed) integer overflow (part of bug #52550 2012-07-02 01:36:35 -04:00
Nuno Lopes
d80ff39189 fix (signed) integer overflow (part of bug #52550 2012-07-02 01:35:28 -04:00
Xinchen Hui
be4053cea0 Fixed bug #62433 (Inconsistent behavior of RecursiveDirectoryIterator to dot files). 2012-07-02 11:33:38 +08:00
Nikita Popov
ff41bfc878 Fix accidential change of php_version.h 
For some reason the merge reverts changed the version :/
 2012-07-01 17:05:19 +02:00
Nikita Popov
b7903f9778 Revert JSON merges to 5.4 
This reverts the following merge commits (-m 1):

405ebfcd18
d372b33c9b
36fa17a5fa
 2012-07-01 16:38:26 +02:00
Nikita Popov
9cbd7a24b6 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Revert JSON changes to PHP 5.3
 2012-07-01 16:35:43 +02:00
Nikita Popov
250393f925 Revert JSON changes to PHP 5.3 
This reverts the following commits:

974324676b
4662151ea7
84fe2cc890

This does not revert the JSON changes released in PHP 5.3.14.
 2012-07-01 16:28:57 +02:00
Stanislav Malyshev
b741d3315b fix bug #61359: json_encode() calls too many reallocs 2012-06-30 19:14:30 -07:00
Stanislav Malyshev
4420b43907 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  remove duplicates, fix order
 2012-06-30 17:37:20 -07:00
Stanislav Malyshev
dfce6bf5d6 update NEWS 2012-06-30 17:37:09 -07:00
Stanislav Malyshev
5f31c81f07 remove duplicates, fix order 2012-06-30 17:36:22 -07:00
Marc Easen
896ac689c9 Fixed the common misspelling of the word occurred (occured -> occurred) 2012-06-30 16:54:03 -07:00
Felipe Pena
b8d453d8d4 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  - Fixed bug #62415 (Undefined variable: diff in run-tests.php on line 2093 for successful XFAIL)
 2012-06-30 16:29:47 -03:00
Felipe Pena
75d8af715c - Fixed bug #62415 (Undefined variable: diff in run-tests.php on line 2093 for successful XFAIL) 2012-06-30 16:29:30 -03:00
andrey
ed1f058591 merge 2012-06-29 16:32:55 +03:00
andrey
b7dbcbd41f Merge branch 'PHP-5.3' into PHP-5.4 2012-06-29 14:48:37 +03:00
andrey
8fe87e7fea fix Bug #62273 Segmentation Fault in Mysqli/Mysqlnd 2012-06-29 14:42:36 +03:00
andrey
a614f8edea Merge branch 'PHP-5.3' into PHP-5.4 2012-06-29 14:41:11 +03:00