Remi Collet
351e80e753
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed Bug #63581 Possible buffer overflow
Fixed Bug #63581 Possible null dereference
2012-11-28 10:39:23 +01:00
Remi Collet
bc7f2b5f41
Merge branch 'PHP-5.3' into PHP-5.5
...
* PHP-5.3:
Fixed Bug #63581 Possible buffer overflow
Fixed Bug #63581 Possible null dereference
2012-11-28 10:38:37 +01:00
Remi Collet
bc492007da
Fixed Bug #63581 Possible buffer overflow
...
In fpm-log, possible buffer overflow. Check for length is done at
the beginning of the loop, so is not done when overflow occurs
on the last loop (len = 1024 or 1025). (ack from fat).
This issue where found from by static code analysis tool and, so,
I can't provide any reproducer.
2012-11-28 10:35:04 +01:00
Remi Collet
e4eb026834
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
BFN #61272
fix bug #61272 ob_start callback get passed empty string
2012-11-28 10:32:23 +01:00
Remi Collet
9519d2b585
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
updated NEWS
Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows
This test isn't supposed to pass on windows
Fixed Bug #63614 (Fatal error on Reflection)
2012-11-28 10:32:00 +01:00
Remi Collet
f08060a48f
Fixed Bug #63581 Possible null dereference
...
Possible NULL dereference when trying to delete the single item
of a list (ack from fat).
This issues where found from by static code analysis tool and,
so, I can't provide any reproducer.
2012-11-28 10:28:18 +01:00
Michael Wallner
178e9919b2
Merge branch 'PHP-5.4'
2012-11-28 10:24:42 +01:00
Remi Collet
1e6baa2673
Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3
...
* 'PHP-5.3' of git.php.net:php-src:
Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows
This test isn't supposed to pass on windows
Fixed Bug #63614 (Fatal error on Reflection)
2012-11-28 10:24:32 +01:00
Remi Collet
6c7c11c2cc
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
updated NEWS
Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows
This test isn't supposed to pass on windows
Fixed Bug #63614 (Fatal error on Reflection)
2012-11-28 10:23:50 +01:00
Michael Wallner
be1e5b9c54
BFN #61272
2012-11-28 10:23:26 +01:00
Michael Wallner
575790e842
fix bug #61272 ob_start callback get passed empty string
2012-11-28 10:19:44 +01:00
Anatoliy Belsky
df3e1fd484
Merge branch 'PHP-5.5'
...
* PHP-5.5:
updated NEWS
Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows
Conflicts:
NEWS
2012-11-27 17:05:48 +01:00
Anatoliy Belsky
ca240f5b22
updated NEWS
2012-11-27 16:59:27 +01:00
Anatoliy Belsky
f094723852
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows
Conflicts:
NEWS
2012-11-27 16:55:47 +01:00
Anatoliy Belsky
d88017e992
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows
Conflicts:
NEWS
ext/fileinfo/libmagic.patch
ext/fileinfo/tests/finfo_open_error-win32.phpt
2012-11-27 16:45:25 +01:00
Anatoliy Belsky
e6b727d3b7
Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows
2012-11-27 16:33:58 +01:00
Anatoliy Belsky
1e8b6536ab
Merge branch 'PHP-5.5'
...
* PHP-5.5:
This test isn't supposed to pass on windows
2012-11-27 16:14:00 +01:00
Anatoliy Belsky
17e21925c8
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
This test isn't supposed to pass on windows
2012-11-27 16:13:19 +01:00
Anatoliy Belsky
e0ad33c24a
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
This test isn't supposed to pass on windows
2012-11-27 16:11:53 +01:00
Anatoliy Belsky
eff12e56b6
This test isn't supposed to pass on windows
2012-11-27 16:02:55 +01:00
Xinchen Hui
344f228798
Merge branch 'PHP-5.5'
2012-11-27 13:38:38 +08:00
Xinchen Hui
8337c96656
Merge branch 'PHP-5.4' into PHP-5.5
2012-11-27 13:37:50 +08:00
Xinchen Hui
070239a194
Merge branch 'PHP-5.3' into PHP-5.4
2012-11-27 13:36:38 +08:00
Xinchen Hui
df3b9a1e07
Fixed Bug #63614 (Fatal error on Reflection)
2012-11-27 13:34:36 +08:00
Remi Collet
23e1996a0e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Related bug #63588 fix length computation + optimize for speed
2012-11-26 13:06:00 +01:00
Remi Collet
495ff0964d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Related bug #63588 fix length computation + optimize for speed
2012-11-26 13:05:37 +01:00
Remi Collet
a45aad9f1f
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
count($test_files) already be checked above : if ($test_cnt)
2012-11-26 13:04:34 +01:00
Remi Collet
dfa5ca2b8d
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
count($test_files) already be checked above : if ($test_cnt)
2012-11-26 13:04:04 +01:00
Remi Collet
7751a68824
Related bug #63588 fix length computation + optimize for speed
...
Following comment from Yoram "The patch looks fine, except of testing
for true value of utf16 in each iteration."
Also fix the length computation during check phase.
2012-11-26 12:59:08 +01:00
Xinchen Hui
0fa937e106
Merge branch 'PHP-5.5'
2012-11-25 16:20:30 +08:00
Xinchen Hui
01a86eae8c
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2012-11-25 16:19:58 +08:00
Xinchen Hui
16efc77608
count($test_files) already be checked above : if ($test_cnt)
...
thus we can use $sum_results instead of the preg_match
2012-11-25 16:18:20 +08:00
Remi Collet
128cc30d85
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #63588 Duplicate implementation of php_next_utf8_char
2012-11-25 08:21:35 +01:00
Remi Collet
f4a8612561
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #63588 Duplicate implementation of php_next_utf8_char
2012-11-25 08:21:10 +01:00
Remi Collet
289bb339c9
Fixed bug #63588 Duplicate implementation of php_next_utf8_char
...
Json use an utf8 parser from a third party library, switch to
our implementation of php_next_utf8_char.
This also helps on solving #63520 . All the unit tests succeed.
Our implementation also seems a little faster.
json.dsp need to be regenerated.
2012-11-25 08:14:23 +01:00
Remi Collet
1550fd880e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed Bug #63361 Header not installed
NEWS entries
2012-11-25 07:49:27 +01:00
Remi Collet
c5d4ee9bed
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed Bug #63361 Header not installed
2012-11-25 07:48:44 +01:00
Remi Collet
8d2c44b59d
Fixed Bug #63361 Header not installed
...
ext/mysqli/php_mysqli_structs.h is installed and includes
mysqli_mysqlnd.h or mysqli_libmysql.h. So this header must also
be installed.
2012-11-25 07:46:02 +01:00
Remi Collet
137503dd6f
NEWS entries
2012-11-25 07:40:39 +01:00
Xinchen Hui
62c3ef9c32
Merge branch 'PHP-5.5'
2012-11-25 12:05:09 +08:00
Xinchen Hui
11c946e594
XFAIL test should not be considered as failed
2012-11-25 12:04:12 +08:00
Xinchen Hui
4d804aa52d
let make test report the run-test result
2012-11-25 12:03:54 +08:00
Xinchen Hui
20d7ef43f7
XFAIL test should not be considered as failed
2012-11-25 11:46:35 +08:00
Xinchen Hui
f03a91226e
let make test report the run-test result
...
(patch by reeze.xia@gmail.com )
2012-11-25 11:45:36 +08:00
Xinchen Hui
f50f703571
Merge branch 'php.ini_text_fix' of https://github.com/BryanH/php-src
2012-11-25 11:24:32 +08:00
Stanislav Malyshev
f3f4556cc6
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix NEWS
5.4.10-dev
2012-11-24 16:30:23 -08:00
Stanislav Malyshev
57204ae6d9
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix NEWS
5.4.10-dev
Conflicts:
configure.in
main/php_version.h
2012-11-24 16:30:00 -08:00
Stanislav Malyshev
c08e2c8c17
fix NEWS
2012-11-24 16:28:56 -08:00
Stanislav Malyshev
7262bf67a2
5.4.10-dev
2012-11-24 16:24:05 -08:00
Nikita Popov
6e1b84a646
Merge branch 'PHP-5.5'
2012-11-24 19:24:40 +01:00