Xinchen Hui
f733173b1f
Fix typo while resolving conflicts
2012-05-23 13:43:49 +08:00
Xinchen Hui
a7df6ce664
Revert "Implemented FR #61602 Allow access to name of constant used as default value"
...
This reverts commit 054f3e3ce5
.
See: http://news.php.net/php.cvs/69137 and the author confirmed.
Will commit later after the author fixed this then make a new PR.
Conflicts:
ext/reflection/php_reflection.c
2012-05-23 13:39:00 +08:00
Matt Ficken
c973fef48d
Fix bug #62066 Test Bug - ext/tidy/tests/004.phpt
2012-05-21 12:51:24 +02:00
Matt Ficken
645d65f3e3
Fixed bug #62068 Test bug - gmp_nextprime and 022
2012-05-21 12:31:16 +02:00
zoe slattery
778d69ddfe
Fix: 62067 Moved comments to FILE section
2012-05-19 16:33:36 +01:00
Felipe Pena
6d928fd26d
- Fixed bug #62064 (memory leak in the XML Writer module)
2012-05-18 19:23:29 -03:00
Johannes Schlüter
67039363cd
Merge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3
...
* 'PHP-5.3' of git.php.net:/php-src:
Fix for bug#62046
2012-05-16 16:46:08 +02:00
Stanislav Malyshev
6e51989501
fd fix
2012-05-16 16:35:16 +02:00
Stanislav Malyshev
4eb802bb14
fix bug #61065
...
(cherry picked from commit a10e778bfb
)
2012-05-16 16:30:29 +02:00
andrey
d4afbd487a
Fix for bug#62046
...
Bug#62046 mysqli@mysqlnd can't iterate over stored sets after call to
mysqli_stmt_reset().
Stmt's state was changed to STMT_PREPARED and leads the driver to think
that the stmt was just prepared. Because result set exist also for only
prepared but not executed sets, the check for stmt->result isn't any good.
There is a result set, because as response for COM_PREPARE the server sends
metadata and metadata is part of a result set. After COM_EXECUTE the server
sends metadata again, which could be different and in this case more correct.
2012-05-16 14:28:55 +02:00
zoe slattery
1af8b3f883
Change impl of GZIP_POST, DEFLATE_POST. See #62021
2012-05-15 11:05:20 +01:00
Nuno Lopes
950d5ee590
fix stack overflow in php_intlog10abs()
...
bug uncovered by LLVM/clang's new -fbounds-checking switch
this patch fixes a crash in ext/standard/tests/math/round_large_exp.phpt
2012-05-11 13:07:00 -04:00
Anatoliy Belsky
266578f584
Fix bug #61992 ext\standard\tests\general_functions\bug44295.phpt fails
...
Exception text differ on windows
2012-05-10 17:07:38 +02:00
Anatoliy Belsky
f7d8b274c7
Fix bug ext\standard\tests\file\realpath_cache_win32.phpt fails
...
What happens here is trivial long overflow. Despite the bug attracted
attention on windows, the same story is on linux. Just wait for a big
anough bucket->key . The linux test had %i to check the key value
which should be %d all the way.
2012-05-10 15:27:44 +02:00
Anatoliy Belsky
7fb16d5bd9
Fix bug 61901 ext\phar\tests\phar_buildfromdirectory2.phpt fails
...
Another error message is produced by win specific code
2012-05-09 13:02:33 +02:00
Matt Ficken
c12fdbde5f
Fix bug 61746 Failing tests in ext/standard/tests/file/windows_links/*
...
Fixed that again for systems having their %SYSTEMROOT% not in
c:\windows
2012-05-08 19:31:41 +02:00
Anatoliy Belsky
d776a933eb
Fix bug 61713 check also that mbstring's found any internal_encoding
2012-05-08 18:31:11 +02:00
Anatoliy Belsky
3a4a25358f
Fix bug #61713 ext\standard\tests\strings\htmlentities10.phpt fails
...
There is a logic error in charset detection part for htmlentities.
When mbstring is compiled shared and mbstring.internal_encoding
is set to pass, it prevents default_charset from being checked
resulting iso-8859-1 being choosed.
2012-05-08 17:42:01 +02:00
Anatoliy Belsky
2068419ae5
Fix bug 61905 ext\phar\tests\zip\phar_commitwrite.phpt fails
2012-05-07 15:39:07 +02:00
Anatoliy Belsky
ce59121c5f
Fix bug 61903 ext\phar\tests\tar\phar_commitwrite.phpt fails
2012-05-07 15:37:29 +02:00
Xinchen Hui
99076bc24f
Change the test folder
2012-05-06 20:31:40 +08:00
Xinchen Hui
7ccd594392
Fixed bug #61730 (Segfault from array_walk modifying an array passed by reference)
2012-05-06 20:01:10 +08:00
Nikita Popov
311ee8f69c
Merge branch 'pull-request/76' into PHP-5.3
2012-05-06 12:45:45 +02:00
Reeze Xia
3e9923dd8d
Fixed Bug #61961 (file_get_content leaks when access empty file with max length)
2012-05-06 18:27:26 +08:00
Xinchen Hui
035ce937e1
Fixed bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction)
2012-05-06 00:40:49 +08:00
Anatoliy Belsky
8a10259642
Fix bug #61906 ext\phar\tests\zip\phar_setsignaturealgo2.phpt fails
2012-05-04 11:40:49 +02:00
Anatoliy Belsky
6c12252790
Fix bug #61904 ext\phar\tests\tar\phar_setsignaturealgo2.phpt
2012-05-04 11:29:49 +02:00
Anatoliy Belsky
69ed09a31c
Fix bug 61902 ext\phar\tests\phar_setsignaturealgo2.phpt falis
...
openssl needs explicit openssl.cnf on windows
2012-05-02 21:38:32 +02:00
andrey
b42d000471
Fix for bug#61411
...
Bug #61411 PDO Segfaults with PERSISTENT == TRUE && EMULATE_PREPARES == FALSE
Wrong allocation, that doesn't follow the scheme of using stmt->persistent
was the root cause of the problem and the crash at free.
2012-05-02 15:55:22 +02:00
Christopher Jones
d14f23365c
Make output order for dom007.phpt platform independent
...
This test has long been near the top of the reported output diffs.
For example, on http://qa.php.net/reports/?version=5.4.0 it has diffed
1307 times out of 3543 reports, at time of this commit. (The second
highest diff has occurred 710 times.)
2012-05-01 15:43:31 -07:00
Christopher Jones
c864b1ca2f
Fix masking in bug61115-1.phpt
...
The test bug61115-1.phpt was diffing for non-debug builds
2012-05-01 14:32:09 -07:00
Anatoliy Belsky
d26e006d7f
Fix bug 61868 ext\dom\tests\DOMDocument_validate_on_parse_variation.phpt fails
2012-04-30 17:23:49 +02:00
Anatoliy Belsky
ec5421d044
Additional fixs for bug 61746 - prepare/clean acls
2012-04-30 14:33:48 +02:00
Anatoliy Belsky
680685127f
Fix bug 61870 ext\session\tests\bug42596.phpt fails
2012-04-30 12:06:28 +02:00
Anatoliy Belsky
8249581a2d
Fix bug ext\filter\tests\bug52209.phpt fails
2012-04-30 10:25:54 +02:00
Xinchen Hui
a601605f14
merge test from PHP-5.4
2012-04-30 12:33:55 +08:00
Xinchen Hui
d80a3d9668
Revert "Merge branch 'fix-pro_nice-test' of https://github.com/reeze/php-src into PHP-5.3"
...
After pushed, I found the test script in 5.4 is already fixed this, so
revert this change, and be consistent with 5.4's test
This reverts commit 24d85e4bd8
, reversing
changes made to bae56a87f8
.
2012-04-30 12:31:33 +08:00
Xinchen Hui
24d85e4bd8
Merge branch 'fix-pro_nice-test' of https://github.com/reeze/php-src into PHP-5.3
2012-04-30 12:29:15 +08:00
Felipe Pena
d44a383986
- Added missing bound check in iptcparse() (path by chris at chiappa.net)
2012-04-29 19:12:12 -03:00
reeze
e52be10b30
Fix test for proc_nice: bsd ps command didn't support option -o "%p %n"
2012-04-30 00:59:54 +08:00
Matt Ficken
dc6d283b1c
Fix bug 61685 putenv('TZ=UTC') doesn't update timezone for localtime()
2012-04-28 11:42:42 +02:00
Anatoliy Belsky
4daab0abec
Fix bug #61791 ext\sqlite3\tests\sqlite3_15_open_error.phpt fails
2012-04-26 15:14:26 +02:00
Anatoliy Belsky
4e9db5ba9f
Fix bug #61800 ext\standard\tests\streams\bug61371.phpt fails
2012-04-26 13:27:01 +02:00
Anatoliy Belsky
433290e199
Partial fix for bug 61743 to get correct icacls path
2012-04-25 18:38:27 +02:00
Anatoliy Belsky
270a406ac9
Fix bug #61413 ext\openssl\tests\openssl_encrypt_crash.phpt fails 5.3 only
2012-04-24 14:05:35 +02:00
Gustavo André dos Santos Lopes
8d748e5de5
Fixed bug #61764 : 'I' unpacks n as signed if n > 2^31-1 on LP64
...
Also fixed possible invalid read on big endian LP64.
2012-04-23 22:09:38 +01:00
Felipe Pena
c8865e3b84
- Fixed bug #61829 (Memory leak when calling MessageFormatter's constructor twice)
2012-04-23 15:18:12 -03:00
Anatoliy Belsky
da1b534601
Fix bug #61811 three of finfo tests failed, see also #61812 .
...
The remaining two was assidentially merged back from 5.4
2012-04-22 19:26:54 +02:00
Xinchen Hui
f13b0ede07
Fixed warning implicit declaration of function 'file_printedlen'
2012-04-22 19:52:07 +08:00
Xinchen Hui
c06e92a533
Fixed bug #61812 (Uninitialised value used in libmagic)
2012-04-22 19:38:14 +08:00