andrey
4d2d8e8717
Merge branch 'PHP-5.3' into PHP-5.4
...
Conflicts:
ext/mysqlnd/mysqlnd_ps.c
merge fix for bug#62046
2012-05-16 15:59:39 +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
Stanislav Malyshev
d84fa39667
Revert "Update test to fix breakage caused by the previous commit."
...
This reverts commit 05c8d4766c
.
Connected to revert 7bbd5521d2
.
2012-05-15 23:25:06 -07:00
Stanislav Malyshev
df2a38e7f8
fd fix
2012-05-15 22:35:43 -07:00
Stanislav Malyshev
a10e778bfb
fix bug #61065
2012-05-15 22:34:34 -07:00
zoe slattery
63401268db
Changes to remaining two tests, #62022
2012-05-15 14:39:51 +01:00
zoe slattery
d99203d44b
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Small fixes to tests, see #62022
2012-05-15 11:43:28 +01:00
zoe slattery
e35f09d774
Small fixes to tests, see #62022
2012-05-15 11:42:14 +01:00
zoe slattery
968dfae6d1
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Change impl of GZIP_POST, DEFLATE_POST. See #62021
2012-05-15 11:06:14 +01:00
zoe slattery
1af8b3f883
Change impl of GZIP_POST, DEFLATE_POST. See #62021
2012-05-15 11:05:20 +01:00
Sebastian Bergmann
83449b48d4
Merge branch 'add-const-name' of git://github.com/reeze/php-src into PHP-5.4
2012-05-15 11:08:08 +02:00
Michael Wallner
0ad53bfd7d
fix bug #60761 zlib.output_compression fails on refresh
2012-05-15 09:33:47 +02:00
Nuno Lopes
8b4b70df56
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:21 -04: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
b43d6c8522
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug #61992 ext\standard\tests\general_functions\bug44295.phpt fails
2012-05-10 17:32:21 +02: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
10d5f2301a
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug ext\standard\tests\file\realpath_cache_win32.phpt fails
2012-05-10 15:36:47 +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
f76d7be876
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug 61901 ext\phar\tests\phar_buildfromdirectory2.phpt fails
2012-05-09 13:04:32 +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
Felipe Pena
92bc49b2b0
- Fixed bug #61978 (Object recursion not detected for classes that implement JsonSerializable)
2012-05-08 21:05:51 -03:00
Anatoliy Belsky
87fa84abde
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug 61746 Failing tests in ext/standard/tests/file/windows_links/*
2012-05-08 19:35:13 +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
Johannes Schlüter
e8e661128a
Fix #61704 (Crash apache, phpinfo() threading issue)
2012-05-08 17:30:05 +02:00
Johannes Schlüter
fb3b6bcf83
Fix folding marks
2012-05-08 15:18:33 +02:00
Anatoliy Belsky
09664063a8
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug 61905 ext\phar\tests\zip\phar_commitwrite.phpt fails
Fix bug 61903 ext\phar\tests\tar\phar_commitwrite.phpt fails
2012-05-07 15:40:16 +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
376635cde8
Merge branch 'PHP-5.3' into PHP-5.4
2012-05-06 20:32:15 +08:00
Xinchen Hui
99076bc24f
Change the test folder
2012-05-06 20:31:40 +08:00
Xinchen Hui
4cceeb25b7
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #61730 (Segfault from array_walk modifying an array passed by reference)
2012-05-06 20:28:18 +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
bef6111609
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Add NEWS entry for bug #61961
Fixed Bug #61961 (file_get_content leaks when access empty file with max length)
2012-05-06 13:33:47 +02: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
0747b29bdf
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
correct NEWS
Fixed bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction)
Conflicts:
ext/curl/interface.c
2012-05-06 00:52:51 +08:00
Xinchen Hui
19632ae7dc
Fixed bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction)
2012-05-06 00:50:37 +08:00
Xinchen Hui
035ce937e1
Fixed bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction)
2012-05-06 00:40:49 +08:00
Anatoliy Belsky
f5936cceeb
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug #61906 ext\phar\tests\zip\phar_setsignaturealgo2.phpt fails
2012-05-04 11:42:05 +02: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
16fdf86ea3
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug #61904 ext\phar\tests\tar\phar_setsignaturealgo2.phpt
2012-05-04 11:32:12 +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
cdce62b724
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug 61902 ext\phar\tests\phar_setsignaturealgo2.phpt falis
2012-05-02 21:41:33 +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
67419499b2
Merge branch 'PHP-5.3' into PHP-5.4
2012-05-02 15:57:08 +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
Stanislav Malyshev
7bbd5521d2
Revert "Fix bug #61537 (json_encode() incorrectly truncates/discards information) and"
...
This reverts commit cb2a1c71c9
.
The fix is not correct, not fixed after discussion on github.
Please fix the issues and reapply the patch
2012-05-01 23:54:10 -07:00
Christopher Jones
93192ec56d
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Make output order for dom007.phpt platform independent
2012-05-01 15:49:19 -07: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
cac09f3333
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix masking in bug61115-1.phpt
2012-05-01 14:34:54 -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
47c8b6039a
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug 61868 ext\dom\tests\DOMDocument_validate_on_parse_variation.phpt fails
2012-04-30 17:25:11 +02: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
fc24e74260
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Additional fixs for bug 61746 - prepare/clean acls
2012-04-30 14:36:42 +02:00
Anatoliy Belsky
ec5421d044
Additional fixs for bug 61746 - prepare/clean acls
2012-04-30 14:33:48 +02:00
Anatoliy Belsky
36836f147c
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug 61870 ext\session\tests\bug42596.phpt fails
2012-04-30 12:10:43 +02:00
Anatoliy Belsky
680685127f
Fix bug 61870 ext\session\tests\bug42596.phpt fails
2012-04-30 12:06:28 +02:00
Anatoliy Belsky
455040c4ab
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug ext\filter\tests\bug52209.phpt fails
2012-04-30 10:28:00 +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
6008f9af8f
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
- Added missing bound check in iptcparse() (path by chris at chiappa.net)
2012-04-29 19:14:03 -03: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
Anatoliy Belsky
6f8fae606b
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug 61685 putenv('TZ=UTC') doesn't update timezone for localtime()
2012-04-28 11:44:54 +02: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
3dbe48762f
Fix bug 61786 Failing tests in ext\session\tests\*
2012-04-26 15:39:45 +02:00
Anatoliy Belsky
94d96f7782
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug #61791 ext\sqlite3\tests\sqlite3_15_open_error.phpt fails
Conflicts:
ext/sqlite3/tests/sqlite3_15_open_error.phpt
2012-04-26 15:17:46 +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
19df3c1b1c
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug #61800 ext\standard\tests\streams\bug61371.phpt fails
2012-04-26 13:28:49 +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
459e758f03
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Partial fix for bug 61743 to get correct icacls path
2012-04-25 18:46:22 +02:00
Anatoliy Belsky
433290e199
Partial fix for bug 61743 to get correct icacls path
2012-04-25 18:38:27 +02:00
Michael Wallner
7c93a16477
fix bug #61443
...
Since upgrade to PHP 5.4, we can't change zlib.output_compression on the
fly
the check for PHP_OUTPUT_WRITTEN was over-zealous
2012-04-24 20:35:49 +02:00
Michael Wallner
df00b64cb9
fixed bug #61820
...
using ob_gzhandler will complain about headers already sent
when no compression
the Vary header should only be sent on the PHP_OUTPUT_HANDLER_START
event
2012-04-24 19:50:00 +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
Anatoliy Belsky
c7f9f54a23
Bug 61610 adopted expected warnings for 5.4
2012-04-24 13:36:43 +02:00
Gustavo André dos Santos Lopes
485638a09c
Merge branch '5.3' into 5.4
2012-04-23 22:10:23 +01: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
883d40667d
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
- Fixed bug #61829 (Memory leak when calling MessageFormatter's constructor twice)
2012-04-23 15:19:23 -03: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
0d115ca211
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed warning implicit declaration of function 'file_printedlen'
2012-04-22 19:59:46 +08:00
Xinchen Hui
f13b0ede07
Fixed warning implicit declaration of function 'file_printedlen'
2012-04-22 19:52:07 +08:00
Xinchen Hui
b225330707
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #61812 (Uninitialised value used in libmagic)
2012-04-22 19:39:02 +08:00
Xinchen Hui
c06e92a533
Fixed bug #61812 (Uninitialised value used in libmagic)
2012-04-22 19:38:14 +08:00
Johannes Schlüter
a571039870
Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
...
* 'PHP-5.4' of git.php.net:/php-src:
Fix test
typo in test
Make css string constant
Fixed typo
Improved performance while sending error page
- BFN
- BFN
- Fixed bug #54197 ([PATH=] sections incompatibility with user_ini.filename set to null) patch by ab@php.net
- Fixed expected test result (patch by ab@php.net in #61769 )
- Fix test title
add pg_escape_identifier/pg_escape_literal
fix RCs
Update to 5.4.2-dev
Bug#59597 NumberFormatter::parse() with TYPE_INT64 results in a 32 bit integer
2012-04-22 02:26:07 +02:00
Johannes Schlüter
bb2f806534
Fix folding
2012-04-22 02:25:02 +02:00
Xinchen Hui
9a22bc2662
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix test
- BFN
2012-04-21 16:03:18 +08:00
Xinchen Hui
2e9eb5e32f
Fix test
...
Reported by cjones
2012-04-21 16:02:25 +08:00
Yasuo Ohgaki
655245afef
add pg_escape_identifier/pg_escape_literal
2012-04-19 13:40:24 -07:00
Stanislav Malyshev
106e0a2e68
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Bug#59597 NumberFormatter::parse() with TYPE_INT64 results in a 32 bit integer
2012-04-19 11:37:31 -07:00
Stanislav Malyshev
5cbf2d6785
Merge branch 'pull-request/61' into PHP-5.3
...
* pull-request/61:
Bug#59597 NumberFormatter::parse() with TYPE_INT64 results in a 32 bit integer
2012-04-19 11:28:30 -07:00
Johannes Schlüter
0589b19abf
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Commit generated file
Fix bug #61755 parsing bug can lead to access violations
Fix bug 61671 ext\spl\tests\fileobject_003.phpt fails
2012-04-19 12:47:47 +02:00
Johannes Schlüter
c06ec6bde4
Commit generated file
2012-04-19 12:47:09 +02:00
Johannes Schlüter
1b78aef426
Fix bug #61755 parsing bug can lead to access violations
2012-04-19 12:46:02 +02:00
Anatoliy Belsky
adfb4c62b7
Fix bug 61671 ext\spl\tests\fileobject_003.phpt fails
...
The solution was already introduced in 5.4 by Etienne Kneuss and
Pierre but wasn't merged back into 5.3 . SplFileObject should
not be used with directories. So just putting together all the
necessary pieces from 5.4
2012-04-19 11:33:12 +02:00
Sherif Ramadan
2827324c7c
Bug#59597 NumberFormatter::parse() with TYPE_INT64 results in a 32 bit integer
2012-04-19 04:44:43 -04:00
Johannes Schlüter
900751e8ae
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Update generated file.
Ensure the SQL parser is regenerated after changes.
2012-04-18 22:50:21 +02:00
Johannes Schlüter
e946eaca0b
Update generated file.
2012-04-18 22:49:03 +02:00
Johannes Schlüter
dda60f3014
Ensure the SQL parser is regenerated after changes.
2012-04-18 22:48:49 +02:00
Yasuo Ohgaki
cce0f8e507
Implement Request #47570 libpq's PG_VERSION should be exported to userland
2012-04-18 12:20:35 +02:00
Anatoliy Belsky
d55afe4df6
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug 61746 Failing tests in ext/standard/tests/file/windows_links/*
2012-04-16 17:07:33 +02:00
Anatoliy Belsky
f3d86b314f
Fix bug 61746 Failing tests in ext/standard/tests/file/windows_links/*
2012-04-16 17:06:30 +02:00
Anatoliy Belsky
3d106aeb0d
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug 61720 ext\libxml\tests\bug61367-read.phpt fails
2012-04-16 15:46:02 +02:00
Anatoliy Belsky
bceafee879
Fix bug 61720 ext\libxml\tests\bug61367-read.phpt fails
2012-04-16 15:45:03 +02:00
Anatoliy Belsky
4ac6862fc4
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug 61719 ext\soap\tests\bugs\bug31422.phpt fails
2012-04-16 15:40:10 +02:00
Anatoliy Belsky
9c8907ec10
Fix bug 61719 ext\soap\tests\bugs\bug31422.phpt fails
2012-04-16 15:38:46 +02:00
Anatoliy Belsky
5d1565088f
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug 61718 ext\ldap\tests\ldap_set_rebind_proc_error.phpt fails
2012-04-16 15:26:50 +02:00
Anatoliy Belsky
1c435ae498
Fix bug 61718 ext\ldap\tests\ldap_set_rebind_proc_error.phpt fails
2012-04-16 15:25:20 +02:00
Anatoliy Belsky
1a44faf264
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug 61717 ext\ldap\tests\ldap_sasl_bind_basic.phpt fails
2012-04-16 15:21:04 +02:00
Anatoliy Belsky
47e7755785
Fix bug 61717 ext\ldap\tests\ldap_sasl_bind_basic.phpt fails
2012-04-16 15:20:03 +02:00
Anatoliy Belsky
d588d01b7c
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug 61680 ext\zlib\tests\gzencode_variation1-win32.phpt fails
2012-04-16 14:05:32 +02:00
Anatoliy Belsky
163c1a393f
Fix bug 61680 ext\zlib\tests\gzencode_variation1-win32.phpt fails
2012-04-16 14:04:29 +02:00
Anatoliy Belsky
ede519d1d6
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug 61676 ext\tidy\tests\bug54682.phpt fails
Conflicts:
ext/tidy/tests/bug54682.phpt
2012-04-16 13:42:52 +02:00
Anatoliy Belsky
c981016e41
Fix bug 61676 ext\tidy\tests\bug54682.phpt fails
2012-04-16 13:38:13 +02:00
Anatoliy Belsky
948f3619f6
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug 61743 tests in ext\standard\tests\file\windows_acls\* fail
2012-04-16 13:33:03 +02:00
Anatoliy Belsky
9a4cb732ed
Fix bug 61743 tests in ext\standard\tests\file\windows_acls\* fail
2012-04-16 13:30:58 +02:00
Xinchen Hui
ed09d26f94
change the bug summary
2012-04-16 19:23:12 +08:00
Xinchen Hui
3b42f184cd
Fixed bug #61728 (php-fpm SIGSEGV running friendica on nginx)
2012-04-15 01:16:34 +08:00
Xinchen Hui
8ceae39d4d
Merge branch 'PHP-5.3' into PHP-5.4
2012-04-13 00:11:04 +08:00
Xinchen Hui
8c4294bcb4
Fixed test faild
...
the sun_path will not be that much long:
http://pubs.opengroup.org/onlinepubs/009695399/basedefs/sys/un.h.html
2012-04-13 00:07:07 +08:00
Adam Harvey
05c8d4766c
Update test to fix breakage caused by the previous commit.
2012-04-11 08:29:39 +08:00
Adam Harvey
cb2a1c71c9
Fix bug #61537 (json_encode() incorrectly truncates/discards information) and
...
remove a test case that's now mooted by this fix.
2012-04-11 08:29:39 +08:00
Adam Harvey
3f3ad30c50
Fix bug #61537 (json_encode() incorrectly truncates/discards information) and
...
remove a test case that's now mooted by this fix.
2012-04-11 08:24:38 +08:00
Anatoliy Belsky
ed0ddd20c5
Fixed bug #61669 ext\standard\tests\file\rename_variation7-win32.phpt fails
2012-04-10 15:16:48 +02:00
Anatoliy Belsky
a9eace9f6e
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #61668 ext\standard\tests\file\rename_variation13-win32.phpt fails
Conflicts:
ext/standard/tests/file/rename_variation13-win32.phpt
2012-04-10 15:12:42 +02:00
Anatoliy Belsky
b0cb29db87
Fixed bug #61668 ext\standard\tests\file\rename_variation13-win32.phpt fails
2012-04-10 15:09:21 +02:00
Anatoliy Belsky
b9cbb9e744
Fix bug #61667 ext\standard\tests\file\glob_variation-win32.phpt fails
2012-04-10 15:00:03 +02:00
Anatoliy Belsky
fde96342e8
Fixed bug #61666 ext\standard\tests\file\file_put_contents_variation8-win32.phpt fails
2012-04-10 14:13:15 +02:00
Anatoliy Belsky
b2f2e1d6cc
Fix bug #61659 Test ext\spl\tests\bug60082.phpt fails
2012-04-10 14:03:19 +02:00
Anatoliy Belsky
024cd2a124
Fixed bug #61638 Test ext\sockets\tests\unixloop.phpt fails
2012-04-10 14:00:51 +02:00
Anatoliy Belsky
bbab846ada
Fixed bug #61637 ext\sockets\tests\socket_sentto_recvfrom_unix.phpt
2012-04-10 14:00:50 +02:00
Anatoliy Belsky
70f2f30e67
Fixed bug #61635 ext\sockets\tests\socket_select-wrongparams-1.phpt
2012-04-10 14:00:50 +02:00
Anatoliy Belsky
b3be5d920a
Fixed bug #61638 Test ext\sockets\tests\unixloop.phpt fails
2012-04-10 13:58:15 +02:00
Anatoliy Belsky
15e26c6d4a
Fixed bug #61637 ext\sockets\tests\socket_sentto_recvfrom_unix.phpt
2012-04-10 13:54:22 +02:00
Anatoliy Belsky
af8646c188
Fixed bug #61635 ext\sockets\tests\socket_select-wrongparams-1.phpt
2012-04-10 13:40:20 +02:00
Anatoliy Belsky
006b04da4a
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #61634 Test ext\sockets\tests\socket_listen-wrongparams.phpt fails
Fixed bug #61633 Test ext\sockets\tests\socket_create_pair-wrongparams.phpt fails
Fixed bug #61632 Test ext\sockets\tests\socket_create_listen.phpt fails
Fixed bug 61621 Test fail in ext/standard/tests/dir
2012-04-10 13:09:48 +02:00
Anatoliy Belsky
c4676ee99f
Fixed bug #61634 Test ext\sockets\tests\socket_listen-wrongparams.phpt fails
2012-04-10 13:08:57 +02:00
Anatoliy Belsky
5b0e7203e6
Fixed bug #61633 Test ext\sockets\tests\socket_create_pair-wrongparams.phpt fails
2012-04-10 13:06:15 +02:00
Anatoliy Belsky
83b48280c7
Fixed bug #61632 Test ext\sockets\tests\socket_create_listen.phpt fails
2012-04-10 13:06:14 +02:00
Anatoliy Belsky
5594fcf423
Fixed bug #61633 Test ext\sockets\tests\socket_create_pair-wrongparams.phpt fails
2012-04-10 13:02:53 +02:00
Anatoliy Belsky
37cb29ae90
Fixed bug #61632 Test ext\sockets\tests\socket_create_listen.phpt fails
2012-04-10 12:57:10 +02:00
Anatoliy Belsky
d80e2e069c
Fixed bug 61621 Test fail in ext/standard/tests/dir
2012-04-10 12:47:01 +02:00
Anatoliy Belsky
31a3e83190
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #61611 ext\date\tests\date_default_timezone_get-2.phpt fails
Fixed bug #61631 mbstring mail related tests fail
Fixed bug #61610 Test ext\date\tests\date_default_timezone_get-1.diff fails
Fix bug #61609 Test ext\date\tests\bug52062.phpt fails As expressed in the comments http://de.php.net/manual/en/datetime.gettimestamp.php this is the generic 32 bit timestamp issue
2012-04-10 12:37:37 +02:00
Anatoliy Belsky
26dbc5ecb4
Fixed bug #61611 ext\date\tests\date_default_timezone_get-2.phpt fails
...
The behaviour on windows is to select an arbitrary timezone from the
current system settings. This gives no chance to hardcode the timezone
name, for instance for UTC+1 it could choose from the multiple names
like Europe/Berlin or Europe/Paris . For this reason the test is
parametrized so there is no hardcoded timezone data.
The original test made to be skipped on windows and a duplicate was made
for windows. Tested on debian and win7 both x86.
2012-04-10 12:33:11 +02:00
Anatoliy Belsky
1a0c9ecaee
Fixed bug #61631 mbstring mail related tests fail
2012-04-10 12:23:07 +02:00
Anatoliy Belsky
fbbad87056
Fixed bug #61610 Test ext\date\tests\date_default_timezone_get-1.diff fails
...
The behaviour on windows is to select an arbitrary timezone from the current system settings.
This gives no chance to hardcode the timezone name, for instance for UTC+1 it could choose
from the multiple names like Europe/Berlin or Europe/Paris . For this reason the test is
parametrized so there is no hardcoded timezone data.
The original test made to be skipped on windows and a duplicate was made for windows.
2012-04-10 12:20:40 +02:00
Anatoliy Belsky
fd68d5b139
Fix bug #61609 Test ext\date\tests\bug52062.phpt fails
...
As expressed in the comments http://de.php.net/manual/en/datetime.gettimestamp.php
this is the generic 32 bit timestamp issue
2012-04-10 12:20:40 +02:00
Anatoliy Belsky
2ca49d39a3
Fixed bug #61631 mbstring mail related tests fail
2012-04-10 11:47:18 +02:00
Anatoliy Belsky
d89b65f985
Fixed bug #61610 Test ext\date\tests\date_default_timezone_get-1.diff fails
...
The behaviour on windows is to select an arbitrary timezone from the current system settings.
This gives no chance to hardcode the timezone name, for instance for UTC+1 it could choose
from the multiple names like Europe/Berlin or Europe/Paris . For this reason the test is
parametrized so there is no hardcoded timezone data.
The original test made to be skipped on windows and a duplicate was made for windows.
2012-04-10 11:03:41 +02:00
Anatoliy Belsky
4ff55e646a
Fix bug #61609 Test ext\date\tests\bug52062.phpt fails
...
As expressed in the comments http://de.php.net/manual/en/datetime.gettimestamp.php
this is the generic 32 bit timestamp issue
2012-04-10 10:18:10 +02:00
Rui Hirokawa
882dca647a
MFH: fixed a mistake on reverting my previous patch.
2012-04-09 23:49:18 +09:00
Nikita Popov
7ae93a2c4c
Fix bug #61660 : bin2hex(hex2bin($data)) != $data
...
If the input data has an odd length a warning is thrown and false is returned.
2012-04-08 22:38:21 +02:00
Gustavo André dos Santos Lopes
f7d4076785
Merge branch '5.3' into 5.4
2012-04-07 16:34:17 +01:00
Gustavo André dos Santos Lopes
0f180a63eb
Fixed bug in new stream_get_line() when using NUL as a delimiter.
...
This is the issue Derick spotted a few days ago..
2012-04-07 16:32:19 +01:00
Anatoliy Belsky
69b2570b72
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug #61480 test bug - ext/gd/tests/bug48555.phpt
updated the NEWS with the latest fileinfo changes
Conflicts:
NEWS
2012-04-04 18:54:03 +02:00
Matt Ficken
381edb425e
Fix bug #61480 test bug - ext/gd/tests/bug48555.phpt
2012-04-04 18:39:24 +02:00
Xinchen Hui
1ff8021519
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #61617 (Libxml tests failed(ht is already destroyed))
Cherry-pick 4cc74767
Conflicts:
NEWS
2012-04-04 17:36:18 +08:00
Xinchen Hui
94f1c05ff8
Fixed bug #61617 (Libxml tests failed(ht is already destroyed))
2012-04-04 17:22:37 +08:00
Gustavo André dos Santos Lopes
ca58cd01fc
Cherry-pick 4cc74767
...
Headers: forbid \r and \n also after \0, allow CRLF followed by HT or SP and forbid \0. See bug #60227 .
Conflicts:
ext/standard/tests/general_functions/bug60227.phpt
ext/standard/tests/general_functions/bug60227_1.phpt
ext/standard/tests/general_functions/bug60227_2.phpt
main/SAPI.c
2012-04-04 09:59:51 +01:00
Xinchen Hui
7b04638c8c
Fix test
...
cherry-pick from php-5.4
2012-04-04 15:20:28 +08:00
reeze
6712d0d20d
Fixed CODING_STANDARD and move parameter parse code
2012-04-04 14:06:55 +08:00
Ilia Alshanetsky
9c5ae9954f
Fixed bug #61423 (gzip compression fails).
2012-04-03 08:47:00 -04:00
Anatoliy Belsky
827c446b62
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug #61460 popen_close_error-win32 expected output is wrong
Conflicts:
ext/standard/tests/file/popen_pclose_error-win32.phpt
2012-04-03 14:22:59 +02:00
Matt Ficken
438536e45e
Fix bug #61460 popen_close_error-win32 expected output is wrong
2012-04-03 14:19:43 +02:00
Anatoliy Belsky
2a8866ba5e
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug #61454 ext\standard\tests\general_functions\bug49847.phpt fails
2012-04-03 13:24:31 +02:00
Anatoliy Belsky
14e74aeb57
Fix bug #61454 ext\standard\tests\general_functions\bug49847.phpt fails
2012-04-03 13:23:06 +02:00
Anatoliy Belsky
b67a4cc340
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug #61481 Test Bug - ext/com_dotnet/tests/bug49192
2012-04-03 13:09:17 +02:00
Anatoliy Belsky
94cefaedaf
Fix bug #61481 Test Bug - ext/com_dotnet/tests/bug49192
2012-04-03 13:07:51 +02:00
Anatoliy Belsky
9c81654378
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug #61517 random test failure - ext/standard/tests/misc/time_sleep_until_basic.phpt
2012-04-03 11:08:02 +02:00
Anatoliy Belsky
469cd3abf1
Fix bug #61517 random test failure - ext/standard/tests/misc/time_sleep_until_basic.phpt
2012-04-03 11:04:52 +02:00
reeze
054f3e3ce5
Implemented FR #61602 Allow access to name of constant used as default value
2012-04-03 13:51:44 +08:00
Anatoliy Belsky
374646c36b
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
updated the libmagic.patch
Bug #61566 Fileinfo ext\fileinfo\tests\finfo_file_002.phpt fails
Fix bug #61565 Fileinfo ext\fileinfo\tests\finfo_file_001.phpt fails
- update to openssl 0.9.8u
Conflicts:
ext/fileinfo/tests/finfo_open_001.phpt
ext/fileinfo/tests/finfo_open_error.phpt
win32/build/libs_version.txt
2012-04-02 17:36:50 +02:00
Anatoliy Belsky
8684fb7fac
updated the libmagic.patch
2012-04-02 17:27:23 +02:00
Anatoliy Belsky
909713e233
Bug #61566 Fileinfo ext\fileinfo\tests\finfo_file_002.phpt fails
...
This patch fixes the failure caused by the
posix lseek and read versions under windows in cdf_read() .
Additionally all the occurences of lseek and read
was replaced by _lseek and _reed for windows.
2012-04-02 17:22:46 +02:00
Anatoliy Belsky
0cdba53aae
Fix bug #61565 Fileinfo ext\fileinfo\tests\finfo_file_001.phpt fails
2012-04-02 17:19:09 +02:00
Derick Rethans
6c6bec5760
Merge branch 'PHP-5.3' into PHP-5.4
2012-04-02 10:40:02 +01:00
Derick Rethans
0e53ac49e6
- Updated to version 2012.3 (2012c)
2012-04-02 10:40:01 +01:00
Popa Adrian Marius
09b303425a
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2012-04-02 10:03:18 +03:00
Popa Adrian Marius
66b3b44fd5
Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3
2012-04-02 10:02:45 +03:00
Christopher Jones
aa774a51d5
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Add php.ini parameter checks for OCI8
2012-03-30 16:17:37 -07:00
Christopher Jones
c56cfbd234
Add php.ini parameter checks for OCI8
...
Add tests for OCI8 php.ini parameters particularly to check
which parameters can be changes with ini_set().
2012-03-30 16:12:25 -07:00
Popa Adrian Marius
5d8a0fd7ec
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix firebird bug #60947 , tested and now it prints the header page information from database
2012-03-29 18:28:22 +03:00
Popa Adrian Marius
97f4fc22c5
Fix firebird bug #60947 , tested and now it prints the header page information from database
2012-03-29 18:28:01 +03:00
Shein Alexey
c02aa086c6
Resolved conflict.
2012-03-29 17:03:43 +05:00
Shein Alexey
c0f806a69c
Merge branch 'fix-debug-build-bug61115-1.phpt' into PHP-5.3
...
* fix-debug-build-bug61115-1.phpt:
Fixed bug61115-1.phpt for debug build version.
2012-03-29 17:01:40 +05:00
Shein Alexey
e1352b0416
Fixed bug61115-1.phpt for debug build version.
2012-03-29 16:51:45 +05:00
Yasuo Ohgaki
8449e0ca89
Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
2012-03-29 20:04:15 +09:00
Yasuo Ohgaki
aecf5485e3
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
2012-03-29 19:55:06 +09:00
Yasuo Ohgaki
931831bf75
Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
2012-03-29 19:48:58 +09:00
Johannes Schlüter
21fa9634c1
Merge remote branch 'security/PHP-5.3' into PHP-5.3
...
* security/PHP-5.3:
fix bug #61367 - open_basedir bypass using libxml RSHUTDOWN
open_basedir check for linkinfo
NEWS entry for readline fix
Add open_basedir checks to readline_write_history and readline_read_history
2012-03-29 10:54:08 +02:00
Gustavo André dos Santos Lopes
f4873c68a6
Merge branch '5.3' into 5.4
...
Conflicts:
main/output.c
2012-03-29 08:47:58 +01:00
Jille Timmermans
710335b2a3
ext/pcntl/pcntl.c: Fix typo in comment
...
Signed-off-by: Jille Timmermans <jille@quis.cx>
2012-03-29 08:46:04 +01:00
Gustavo André dos Santos Lopes
616d802974
Revert "ext/pcntl/pcntl.c: Fix typo in comment" (apply correct workflow)
...
This reverts commit 4aeabaf8e9
.
2012-03-29 08:45:00 +01:00
Gustavo André dos Santos Lopes
117cdf384f
Revert "ext/pcntl/pcntl.c: Fix typo in comment" (apply correct workflow)
...
This reverts commit 55b1e61242
.
2012-03-29 08:44:19 +01:00
Stanislav Malyshev
fe79276371
Merge branch 'sec54' into PHP-5.4
...
* sec54:
update NEWS
fix bug #61367 - open_basedir bypass using libxml RSHUTDOWN
open_basedir check for linkinfo
NEWS entry for readline fix
NEWS entry for readline fix
Add open_basedir checks to readline_write_history and readline_read_history
2012-03-28 21:16:04 -07:00
Jille Timmermans
4aeabaf8e9
ext/pcntl/pcntl.c: Fix typo in comment
...
Signed-off-by: Jille Timmermans <jille@quis.cx>
2012-03-29 09:07:19 +09:00
Jille Timmermans
55b1e61242
ext/pcntl/pcntl.c: Fix typo in comment
...
Signed-off-by: Jille Timmermans <jille@quis.cx>
2012-03-29 09:07:07 +09:00
Anatoliy Belsky
92bca7436f
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug #61459 popen_close_basic-win32 can't run sort.exe
2012-03-28 19:32:24 +02:00
Anatoliy Belsky
eeab3be303
Fix bug #61459 popen_close_basic-win32 can't run sort.exe
2012-03-28 19:25:29 +02:00
Anatoliy Belsky
fa0d507923
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug #61401 ext\openssl\tests\004.phpt fails
Fix bug #61404 ext\openssl\tests\021.phpt fails
Fix bug #61448 intl tests fail with icu >= 4.8
2012-03-28 17:13:16 +02:00
Anatoliy Belsky
bff8152565
Fix bug #61401 ext\openssl\tests\004.phpt fails
2012-03-28 17:11:58 +02:00
Anatoliy Belsky
4c5b427124
Fix bug #61404 ext\openssl\tests\021.phpt fails
2012-03-28 16:15:36 +02:00
Anatoliy Belsky
bd7bb973b1
Fix bug #61404 ext\openssl\tests\021.phpt fails
2012-03-28 16:04:56 +02:00
Anatoliy Belsky
bd928f0592
Fix bug #61448 intl tests fail with icu >= 4.8
2012-03-28 15:07:01 +02:00
Anatoliy Belsky
fa7f215d19
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
...
* 'PHP-5.4' of git.php.net:php-src:
Fixed problem introduced in a763929
(fixing bug #61347 ).
2012-03-28 14:51:16 +02:00
Gustavo André dos Santos Lopes
a9121819d0
Merge remote branch 'origin/PHP-5.4' into 5.4
2012-03-28 13:13:52 +01:00
Gustavo André dos Santos Lopes
4fa0c2a963
Merge remote branch 'origin/PHP-5.3' into 5.3
2012-03-28 13:12:12 +01:00
Gustavo André dos Santos Lopes
593578c8c1
Merge branch '5.3' into 5.4
2012-03-28 13:06:05 +01:00
Gustavo André dos Santos Lopes
f07dd29fdc
Fixed problem introduced in a763929
(fixing bug #61347 ).
...
The test added in 8c44c85
should now pass.
2012-03-28 13:04:41 +01:00
Anatoliy Belsky
105a9a9d45
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug #61448 intl tests fail with icu >= 4.8
2012-03-28 14:01:14 +02:00
Anatoliy Belsky
103995ba22
Fix bug #61448 intl tests fail with icu >= 4.8
2012-03-28 13:59:51 +02:00
Anatoliy Belsky
d406f2b034
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug #61468 ext/phar/tests/phar_oo_005.phpt fails
2012-03-28 12:56:17 +02:00
Anatoliy Belsky
0b20329aaf
Fix bug #61468 ext/phar/tests/phar_oo_005.phpt fails
2012-03-28 12:54:19 +02:00
Anatoliy Belsky
4f23ee8f5e
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Bug 61504 updated libmagic.patch
Bug #61504 TSRML_FETCH() must be last
2012-03-28 12:10:25 +02:00
Anatoliy Belsky
11f04c3524
Bug 61504 updated libmagic.patch
2012-03-28 12:06:09 +02:00
Anatoliy Belsky
e7fa402c7c
Bug #61504 TSRML_FETCH() must be last
2012-03-28 12:05:20 +02:00
Gustavo André dos Santos Lopes
067603106e
Restored the good part of 74ee335
that was just reverted.
2012-03-28 08:43:41 +01:00
Gustavo André dos Santos Lopes
c6e15455a3
Revert "- fix bug #61504 , fix build errors on windows and possibly other"
...
This reverts commit 74ee335e3a
.
2012-03-28 08:41:18 +01:00
Pierre Joye
c195596280
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
- fix bug #61504 , fix build errors on windows and possibly other
Conflicts:
Zend/zend_language_scanner.c
Zend/zend_language_scanner_defs.h
2012-03-28 02:11:06 +02:00
Pierre Joye
74ee335e3a
- fix bug #61504 , fix build errors on windows and possibly other
2012-03-28 01:59:41 +02:00
Christopher Jones
00b4862167
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Update README
2012-03-27 11:54:05 -07:00
Christopher Jones
968a330220
Update README
...
More updates to OCI8 README as an excuse to try the PHP multi-dir git
workflow instructions.
2012-03-27 11:19:33 -07:00
Anatoliy Belsky
c447704f98
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug #61518 skip on windows, fix on linux - ext/standard/tests/streams/bug60106.phpt
2012-03-27 18:53:50 +02:00
Anatoliy Belsky
da85d5b4a0
Fix bug #61518 skip on windows, fix on linux - ext/standard/tests/streams/bug60106.phpt
2012-03-27 18:49:59 +02:00
Anatoliy Belsky
b7596eaa1b
Merge branch '5.3' into 5.4
...
* 5.3:
Fix bug #61519 test fails, should pass - ext/zlib/tests/bug60761.phpt
Conflicts:
ext/zlib/tests/bug60761.phpt
2012-03-27 18:16:02 +02:00
Anatoliy Belsky
bcfcfb2fc5
Fix bug #61519 test fails, should pass - ext/zlib/tests/bug60761.phpt
2012-03-27 18:02:31 +02:00
Anatoliy Belsky
8d7a489b97
Merge branch '5.3' into 5.4
...
* 5.3:
Fix bug #61405 ext\openssl\tests\022.phpt fails
Fix bug #61412 ext\openssl\tests\bug28382.phpt fails
2012-03-27 16:15:15 +02:00
Anatoliy Belsky
b638d3020c
Fix bug #61405 ext\openssl\tests\022.phpt fails
2012-03-27 16:07:59 +02:00
Anatoliy Belsky
e55718b091
Fix bug #61412 ext\openssl\tests\bug28382.phpt fails
2012-03-27 16:07:59 +02:00
Anatoliy Belsky
7fdd35d697
Fix bug #61412 ext\openssl\tests\bug28382.phpt fails
2012-03-27 16:07:25 +02:00
Shein Alexey
1b179545c2
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Added failing test for ArrayObject::offsetExists().
2012-03-27 19:00:28 +05:00
Shein Alexey
ddac4688e8
Added failing test for ArrayObject::offsetExists().
2012-03-27 18:59:04 +05:00
Pierre Joye
a8174653e3
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
- fix test for 5.11
Fix bug #61504 , potential vuln. in fileinfo. update to 5.11
2012-03-27 14:02:07 +02:00
Pierre Joye
d0e3289d12
- fix test for 5.11
2012-03-27 14:01:38 +02:00
Pierre Joye
12cf930a40
Fix bug #61504 , potential vuln. in fileinfo. update to 5.11
2012-03-27 13:34:46 +02:00
Stanislav Malyshev
50bdc48685
fix test
2012-03-25 13:53:49 -07:00
Stanislav Malyshev
d51c1e0a4c
fix tests
2012-03-25 13:49:19 -07:00
Stanislav Malyshev
2a74cb4008
Merge branch 'sec53' into sec54
...
* sec53:
fix bug #61367 - open_basedir bypass using libxml RSHUTDOWN
2012-03-25 12:51:46 -07:00
Stanislav Malyshev
167e2fd782
fix bug #61367 - open_basedir bypass using libxml RSHUTDOWN
2012-03-25 12:50:25 -07:00
Stanislav Malyshev
2bd5fa0eda
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
fix bug #61487 - bad bounds check in grapheme_strpos
2012-03-25 01:03:25 -07:00
Stanislav Malyshev
cd9cd36d7e
fix bug #61487 - bad bounds check in grapheme_strpos
2012-03-25 00:56:38 -07:00
Rasmus Lerdorf
b08b7fe787
Merge branch 'PHP-5.3' into PHP-5.4
2012-03-25 05:45:55 +05:30
Rasmus Lerdorf
900778731c
open_basedir check for linkinfo
2012-03-25 05:32:21 +05:30
Pierrick Charron
7f05a39fce
Merge branch 'PHP-5.3' into PHP-5.4
2012-03-24 17:59:46 -04:00
Pierrick Charron
da2da13f93
Remove unused variable
2012-03-24 17:49:58 -04:00