bb2f806534
Fix folding
2012-04-22 02:25:02 +02:00
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
c06ec6bde4
Commit generated file
2012-04-19 12:47:09 +02:00
1b78aef426
Fix bug #61755 parsing bug can lead to access violations
2012-04-19 12:46:02 +02:00
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
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
e946eaca0b
Update generated file.
2012-04-18 22:49:03 +02:00
dda60f3014
Ensure the SQL parser is regenerated after changes.
2012-04-18 22:48:49 +02:00
cce0f8e507
Implement Request #47570 libpq's PG_VERSION should be exported to userland
2012-04-18 12:20:35 +02:00
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
f3d86b314f
Fix bug 61746 Failing tests in ext/standard/tests/file/windows_links/*
2012-04-16 17:06:30 +02:00
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
bceafee879
Fix bug 61720 ext\libxml\tests\bug61367-read.phpt fails
2012-04-16 15:45:03 +02:00
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
9c8907ec10
Fix bug 61719 ext\soap\tests\bugs\bug31422.phpt fails
2012-04-16 15:38:46 +02:00
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
1c435ae498
Fix bug 61718 ext\ldap\tests\ldap_set_rebind_proc_error.phpt fails
2012-04-16 15:25:20 +02:00
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
47e7755785
Fix bug 61717 ext\ldap\tests\ldap_sasl_bind_basic.phpt fails
2012-04-16 15:20:03 +02:00
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
163c1a393f
Fix bug 61680 ext\zlib\tests\gzencode_variation1-win32.phpt fails
2012-04-16 14:04:29 +02:00
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
c981016e41
Fix bug 61676 ext\tidy\tests\bug54682.phpt fails
2012-04-16 13:38:13 +02:00
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
9a4cb732ed
Fix bug 61743 tests in ext\standard\tests\file\windows_acls\* fail
2012-04-16 13:30:58 +02:00
ed09d26f94
change the bug summary
2012-04-16 19:23:12 +08:00
3b42f184cd
Fixed bug #61728 (php-fpm SIGSEGV running friendica on nginx)
2012-04-15 01:16:34 +08:00
8ceae39d4d
Merge branch 'PHP-5.3' into PHP-5.4
2012-04-13 00:11:04 +08:00
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
05c8d4766c
Update test to fix breakage caused by the previous commit.
2012-04-11 08:29:39 +08:00
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
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
ed0ddd20c5
Fixed bug #61669 ext\standard\tests\file\rename_variation7-win32.phpt fails
2012-04-10 15:16:48 +02:00
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
b0cb29db87
Fixed bug #61668 ext\standard\tests\file\rename_variation13-win32.phpt fails
2012-04-10 15:09:21 +02:00
b9cbb9e744
Fix bug #61667 ext\standard\tests\file\glob_variation-win32.phpt fails
2012-04-10 15:00:03 +02:00
fde96342e8
Fixed bug #61666 ext\standard\tests\file\file_put_contents_variation8-win32.phpt fails
2012-04-10 14:13:15 +02:00
b2f2e1d6cc
Fix bug #61659 Test ext\spl\tests\bug60082.phpt fails
2012-04-10 14:03:19 +02:00
024cd2a124
Fixed bug #61638 Test ext\sockets\tests\unixloop.phpt fails
2012-04-10 14:00:51 +02:00
bbab846ada
Fixed bug #61637 ext\sockets\tests\socket_sentto_recvfrom_unix.phpt
2012-04-10 14:00:50 +02:00
70f2f30e67
Fixed bug #61635 ext\sockets\tests\socket_select-wrongparams-1.phpt
2012-04-10 14:00:50 +02:00
b3be5d920a
Fixed bug #61638 Test ext\sockets\tests\unixloop.phpt fails
2012-04-10 13:58:15 +02:00
15e26c6d4a
Fixed bug #61637 ext\sockets\tests\socket_sentto_recvfrom_unix.phpt
2012-04-10 13:54:22 +02:00
af8646c188
Fixed bug #61635 ext\sockets\tests\socket_select-wrongparams-1.phpt
2012-04-10 13:40:20 +02:00
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
c4676ee99f
Fixed bug #61634 Test ext\sockets\tests\socket_listen-wrongparams.phpt fails
2012-04-10 13:08:57 +02:00
5b0e7203e6
Fixed bug #61633 Test ext\sockets\tests\socket_create_pair-wrongparams.phpt fails
2012-04-10 13:06:15 +02:00
83b48280c7
Fixed bug #61632 Test ext\sockets\tests\socket_create_listen.phpt fails
2012-04-10 13:06:14 +02:00
5594fcf423
Fixed bug #61633 Test ext\sockets\tests\socket_create_pair-wrongparams.phpt fails
2012-04-10 13:02:53 +02:00
37cb29ae90
Fixed bug #61632 Test ext\sockets\tests\socket_create_listen.phpt fails
2012-04-10 12:57:10 +02:00
Johannes Schlüter