bb2f806534
Fix folding
2012-04-22 02:25:02 +02:00
36a5565467
Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
...
* 'PHP-5.4' of git.php.net:/php-src:
2012-04-19 12:48:18 +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
1f4b4c384e
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug 61671 ext\spl\tests\fileobject_003.phpt fails
2012-04-19 11:36:50 +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
ff7e1ff677
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Drop old README
2012-04-19 00:30:45 +02:00
4650b2164b
Drop old README
2012-04-19 00:29:24 +02:00
cc85e7c313
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix slight grammar glitch (thanks Dan Brown)
2012-04-19 00:08:36 +02:00
710021d1d4
Fix slight grammar glitch (thanks Dan Brown)
2012-04-19 00:07:40 +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
56d8d35300
Fix NEWS, the previous wrong was introduced in commit cb2a1c71c9
...
http://git.php.net/?p=php-src.git;a=commitdiff;h=cb2a1c71c96d7c9b2ee03d77beae0c8e0d385f1b
2012-04-18 18:43:46 +08:00
172aa3c6d7
update NEWS
2012-04-18 18:42:39 +08:00
0618e33b5d
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 bug #61761 ('Overriding' a private static method with a different signature causes crash)
2012-04-18 12:22:27 +02:00
d6394e66a3
Add NEWS
2012-04-18 12:21:05 +02:00
cce0f8e507
Implement Request #47570 libpq's PG_VERSION should be exported to userland
2012-04-18 12:20:35 +02:00
da6465a268
Fixed bug #61761 ('Overriding' a private static method with a different signature causes crash)
2012-04-18 18:13:27 +08: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
9f42c1890b
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug 61716 tests\basic\021.phpt fails
2012-04-16 15:16:06 +02:00
4fa1743009
Fix bug 61716 tests\basic\021.phpt fails
2012-04-16 15:14:26 +02:00
45977c6aae
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug 61683 tests\basic\bug20539.phpt fails
2012-04-16 14:39:39 +02:00
aaed0af418
Fix bug 61683 tests\basic\bug20539.phpt fails
2012-04-16 14:38:16 +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
6ecac26972
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Rename README.SVN-RULES to README.GIT-RULES, here, too
2012-04-14 00:31:00 +02:00
21d314a767
Rename README.SVN-RULES to README.GIT-RULES, here, too
2012-04-14 00:29:55 +02:00
de6dfe5bbd
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
configure.in: Check for README.GIT-RULES instead of README.SVN-RULES
Conflicts:
configure.in
2012-04-13 16:33:25 +02:00
e9b978c374
configure.in: Check for README.GIT-RULES instead of README.SVN-RULES
...
We removed the README.SVN-RULES file. Configure checks for this file.
Let's check for the new README.GIT-RULES instead.
2012-04-13 16:32:41 +02:00
676f0deb38
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Move and update README.SVN-RULES to README.GIT-RULES
2012-04-13 02:15:39 +02:00
e0d5138660
Move and update README.SVN-RULES to README.GIT-RULES
2012-04-13 02:12:47 +02: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
Johannes Schlüter