archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-21 01:45:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
70979 commits 526 branches 1434 tags 883 MiB
Commit graph

30035 commits

Author SHA1 Message Date
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
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
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
Nikita Popov
ed54357fcd Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix potential integer overflow in nl2br
  Fix potential integer overflow in bin2hex
 2012-07-05 21:00:16 +02: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
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
Xinchen Hui
8d81a03e43 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #62433 (Inconsistent behavior of RecursiveDirectoryIterator to dot files).
 2012-07-02 11:34:33 +08:00
Xinchen Hui
be4053cea0 Fixed bug #62433 (Inconsistent behavior of RecursiveDirectoryIterator to dot files). 2012-07-02 11:33:38 +08: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
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
f3a4612c47 Merge branch 'PHP-5.4' 
* PHP-5.4:
  fix bug #61359: json_encode() calls too many reallocs
 2012-06-30 19:15:10 -07:00
Stanislav Malyshev
b741d3315b fix bug #61359: json_encode() calls too many reallocs 2012-06-30 19:14:30 -07:00
Stanislav Malyshev
a3322f8927 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed the common misspelling of the word occurred (occured -> occurred)
 2012-06-30 17:00:25 -07:00
Marc Easen
896ac689c9 Fixed the common misspelling of the word occurred (occured -> occurred) 2012-06-30 16:54:03 -07:00
andrey
c51fbbe4b4 merge 2012-06-29 16:58:53 +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
a19d5c520c Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4 2012-06-29 14:41:01 +03:00
andrey
1ac611f24f Merge branch 'PHP-5.3' of ssh://git.php.net/php-src into PHP-5.3 2012-06-29 14:40:41 +03:00
andrey
2abf2738f4 Merge branch 'master' of ssh://git.php.net/php-src 2012-06-29 14:39:47 +03:00
Nikita Popov
0b96fb4af5 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix some lengths in crypt()
 2012-06-29 13:15:53 +02:00
Nikita Popov
d86b6ea35c Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix some lengths in crypt()

Conflicts:
	ext/standard/crypt.c
 2012-06-29 13:15:35 +02:00
Nikita Popov
e6cf7d7745 Fix some lengths in crypt() 
Use salt_len_in instead of strlen(salt) or PHP_MAX_SALT_LEN, otherwise too
much memory will be allocated.

sha512 has a 86 character checksum, not 43. That probably was a copy&paste
from the sha256 code which indeed has 43.

The allocation also was using sizeof(char *), thus allocating 4 or 8 times
as much memory as necessary. The sizeof(char *) was removed in the 5.4
branch in b7a92c9 but forgotten on 5.3.

The memset 0 call was using PHP_MAX_SALT_LEN which can be smaller than the
output buffer and thus not zeroing out everything. Use the size of the
output buffer (needed) instead.
 2012-06-29 13:11:43 +02:00
andrey
267eba1805 Merge branch 'master' of ssh://git.php.net/php-src 2012-06-29 12:44:49 +03:00
andrey
0620ad2031 Merge branch 'PHP-5.4' 2012-06-29 12:43:41 +03:00
andrey
08f4b3c3ac Merge branch 'PHP-5.3' into PHP-5.4 2012-06-29 12:43:14 +03:00
andrey
f826ea093f new charsets 2012-06-29 12:42:54 +03:00
Anthony Ferrara
63318772ae Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #62443 (Crypt SHA256/512 Segfaults With Malformed Salt)
 2012-06-28 20:38:31 -04:00
Anthony Ferrara
34ab5650bc Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #62443 (Crypt SHA256/512 Segfaults With Malformed Salt)
 2012-06-28 20:36:21 -04:00
Anthony Ferrara
7e8276ca68 Fixed bug #62443 (Crypt SHA256/512 Segfaults With Malformed Salt) 
Fixed a memory allocation bug in crypt() SHA256/512 that can
cause segmentation faults when passed in salts with a null byte
early.
 2012-06-28 20:00:03 -04:00
Nikita Popov
cd7ab5cd11 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Add json_last_error_msg() function
 2012-06-29 00:22:45 +02:00
Nikita Popov
405ebfcd18 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Add json_last_error_msg() function
 2012-06-28 20:18:19 +02:00
Nikita Popov
974324676b Add json_last_error_msg() function 
This replaces json_last_error(true) and is consistent with other custom
error handling functions.
 2012-06-28 20:11:27 +02:00
Johannes Schlüter
b025b9d0cf Fix #62432 ReflectionMethod random corrupt memory on high concurrent 
This fixes the same issue in multiple extensions. This isn't needed
in later branches as 5.4 introduced object_properties_init()
 2012-06-27 23:26:33 +02:00
andrey
46879ee4c2 Merge branch 'master' of http://git.php.net/repository/php-src 2012-06-27 16:51:35 +03:00
andrey
6e648e9340 trace allocations in a file 2012-06-27 16:51:07 +03:00
Felipe Pena
8d264dba93 - Fixed build 2012-06-27 09:01:02 -03:00
Nikita Popov
31dbd46641 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Improve JSON error handling

Conflicts:
	main/php_version.h
 2012-06-27 12:32:20 +02:00
Nikita Popov
d372b33c9b Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Improve JSON error handling

Conflicts:
	ext/json/tests/bug54058.phpt
	ext/json/tests/bug61537.phpt
 2012-06-27 12:28:55 +02:00
Nikita Popov
4662151ea7 Improve JSON error handling 
json_encode() no longer throws warnings. Instead only the error code for
json_last_error() is set.

As it is hard to debug the error from just an error code an optional
$as_string parameter was added to json_last_error(), which returns an
error message instead of an error code.
 2012-06-27 12:21:48 +02:00
Johannes Schlüter
02d8e8959b Merge branch 'master' of git.php.net:/php-src 
* 'master' of git.php.net:/php-src: (22 commits)
  Fix bug #62373 (serialize() generates wrong reference to the object)
  Update UPGRADING given 7596445
  Fix typo in error message
  BreakIterator: fix compat with old ICU versions
  Fix build error one ext/intl
  Duplicate test for ICU 49
  Fix undeclared intl_locale_get_default()
  Fix memory allocation checks for base64 encode
  Improve json_encode error handling
  - BFN
  - BFN
  - Improved fix for #62384
  BreakIterator::getPartsIterator: new optional arg
  Added IntlCodePointBreakIterator.
  Add Intl prefix to BreakIterator/RuleBasedBI
  Remove trailing space
  Replaced zend_parse_method_params with plain zpp
  BreakIter: Removed getAvailableLocales/getHashCode
  Change in BreakIterator::getPartsIterator()
  BreakIterator: add rules status constants
  ...
 2012-06-26 12:34:36 +02:00