cfb1ffb4fa
Fix typo in test
2013-06-17 13:22:20 +08:00
ebef8c4176
Identation Fixed
2013-06-16 18:13:49 -07:00
ee01af7df1
Fix bug #64764 : Add status option to fpm init.d script
2013-06-16 16:54:49 -07:00
2a93fd1347
news for #64166
2013-06-16 16:40:39 -07:00
7bb052ee3e
add more tests for bug #64166
2013-06-16 16:34:34 -07:00
0dc98208ee
Move unsigned char declaration to top of block
2013-06-16 16:04:29 -07:00
d9c034ee5e
trailing ws
2013-06-16 16:04:24 -07:00
b5b0a53b09
Fix #64166 : quoted-printable-encode stream filter incorrectly discarding whitespace
...
Second attempt: need to use lookaheadto determine whether to encode ws
2013-06-16 16:04:19 -07:00
600d6deef9
Fix #64166 : quoted-printable-encode stream filter incorrectly discarding whitespace
...
If trailing whitespace on a line is detected, mark the linebreak as a
soft linebreak.
2013-06-16 16:04:14 -07:00
2208447d42
Fix bug #64936 - clean doc comment state at the beginning and end of the scan
2013-06-16 15:22:23 -07:00
088c183639
ws fix
2013-06-16 15:22:23 -07:00
b6dd1ec60d
fix test
...
breach introduced in ac40c0b562
2013-06-17 00:09:05 +02:00
49e57a3165
Fixed bug #63176 (Segmentation fault when instantiate 2 persistent PDO to the same db server)
2013-06-16 22:55:59 +08:00
7457867ba8
fix typo in test
2013-06-16 00:09:18 +04:00
8acfa0b3f8
Merge branch 'PHP-5.4' of https://git.php.net/push/php-src into PHP-5.4
...
* 'PHP-5.4' of https://git.php.net/push/php-src: (76 commits)
Fixed bug #63186 (compile failure on netbsd)
fix test for bug #60322
ensure the error_reporting level to get expected notice
fixed tests
missing tests for bug #53437
fix double entry
Merge branch 'pull-request/341'
typo fixes (argument)
typo fixes (accommodate, parameter)
missing colon
Backported the fix for bug #53437
Backported the fix for bug #53437
Fixed bug #64988 (Class loading order affects E_STRICT warning)
Fixed test script
PHPTests for the DOMDocument::loadHTMLfile method. They cover - The basic behaviour - When the method receives as argument a file which doesn't exist - When the argument is an empty string - When an empty file is loaded - When a not-well formed html file is loaded
Fix spelling and correct typo.
Callback has to be restored in MSHUTDOWN
Update NEWs
Fixed bug #64997 (Segfault while using RecursiveIteratorIterator on 64-bits systems)
Fixed merge wrongly
...
2013-06-16 00:03:30 +04:00
02f552ceca
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #63186 (compile failure on netbsd)
2013-06-14 16:54:32 +02:00
6238dd6f32
Fixed bug #63186 (compile failure on netbsd)
2013-06-14 16:51:54 +02:00
10b9579395
fix test for bug #60322
2013-06-13 10:30:00 -07:00
ed2690477c
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
ensure the error_reporting level to get expected notice
2013-06-12 13:14:53 +02:00
cd1b44c4b6
ensure the error_reporting level to get expected notice
2013-06-12 13:13:48 +02:00
1cc750493f
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
fixed tests
2013-06-11 12:39:28 +02:00
eccc05fc44
fixed tests
2013-06-11 12:38:49 +02:00
251ec84a97
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
missing tests for bug #53437
2013-06-11 11:22:55 +02:00
f16143f5ac
missing tests for bug #53437
2013-06-11 11:19:57 +02:00
760b7d00c3
fix double entry
2013-06-10 18:15:03 -07:00
ac40c0b562
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:20:18 -07:00
04145dc2aa
typo fixes (argument)
2013-06-10 13:36:17 -07:00
ed2e84e239
typo fixes (accommodate, parameter)
2013-06-10 13:36:03 -07:00
7a1e670d76
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
missing colon
2013-06-10 19:55:06 +02:00
18403e496d
missing colon
2013-06-10 19:54:29 +02:00
0f9cf35315
Backported the fix for bug #53437
2013-06-10 19:52:29 +02:00
e1e07cb431
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Backported the fix for bug #53437
2013-06-10 19:49:31 +02:00
88c2dbe5fc
Backported the fix for bug #53437
2013-06-10 19:48:18 +02:00
d8792d87cf
Fixed bug #64988 (Class loading order affects E_STRICT warning)
2013-06-10 21:26:11 +08:00
53c39e2b4e
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
...
* 'PHP-5.4' of git.php.net:php-src:
PHPTests for the DOMDocument::loadHTMLfile method. They cover - The basic behaviour - When the method receives as argument a file which doesn't exist - When the argument is an empty string - When an empty file is loaded - When a not-well formed html file is loaded
Fix spelling and correct typo.
2013-06-10 12:59:28 +04:00
f68b8a5e74
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed test script
2013-06-10 12:54:54 +04:00
f5f6404260
Fixed test script
2013-06-10 12:53:19 +04:00
8a8bef1b73
PHPTests for the DOMDocument::loadHTMLfile method.
...
They cover
- The basic behaviour
- When the method receives as argument a file which doesn't exist
- When the argument is an empty string
- When an empty file is loaded
- When a not-well formed html file is loaded
It also includes 2 auxilary files
- An empty html file
- A not well formed html file
2013-06-10 01:50:00 -07:00
f4e3c7ab7c
Fix spelling and correct typo.
2013-06-10 01:42:27 -07:00
336a8e1943
Callback has to be restored in MSHUTDOWN
2013-06-10 12:32:53 +04:00
fdd7379686
Update NEWs
2013-06-09 22:25:28 +08:00
f338510c94
Merge branch 'PHP-5.3' into PHP-5.4
2013-06-09 22:25:07 +08:00
75c57122e3
Fixed bug #64997 (Segfault while using RecursiveIteratorIterator on 64-bits systems)
2013-06-09 22:24:48 +08:00
e14800dd46
Fixed merge wrongly
2013-06-09 14:24:05 +08:00
3cc891bf3a
Update NEWS
2013-06-09 13:39:40 +08:00
ab22fda7e5
Merge branch 'PHP-5.3' into PHP-5.4
2013-06-09 13:35:45 +08:00
e8f004d542
Fixed bug #64966 (segfault in zend_do_fcall_common_helper_SPEC)
2013-06-09 13:20:40 +08:00
a7e25bdd48
fix 5.4.16 date
2013-06-06 13:27:04 -07:00
4b96b8f909
updated NEWS
2013-06-06 18:52:05 +02:00
25cae37b13
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #64934 Apache2 TS crash with get_browser()
2013-06-06 18:51:32 +02:00
Xinchen Hui