Stanislav Malyshev
84e35fb2e0
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
typo fixes (argument)
typo fixes (accommodate, parameter)
2013-06-10 13:36:41 -07:00
Veres Lajos
04145dc2aa
typo fixes (argument)
2013-06-10 13:36:17 -07:00
Veres Lajos
ed2e84e239
typo fixes (accommodate, parameter)
2013-06-10 13:36:03 -07:00
Anatol Belski
cf5b3fb166
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
missing colon
2013-06-10 19:55:30 +02:00
Anatol Belski
7a1e670d76
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
missing colon
2013-06-10 19:55:06 +02:00
Anatol Belski
18403e496d
missing colon
2013-06-10 19:54:29 +02:00
Anatol Belski
3a92c1beeb
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Backported the fix for bug #53437
Backported the fix for bug #53437
2013-06-10 19:53:03 +02:00
Anatol Belski
0f9cf35315
Backported the fix for bug #53437
2013-06-10 19:52:29 +02:00
Anatol Belski
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
Anatol Belski
88c2dbe5fc
Backported the fix for bug #53437
2013-06-10 19:48:18 +02:00
Anatol Belski
760c85a70a
fixed the test
2013-06-10 18:31:18 +02:00
Anatol Belski
02f3922047
Fix a BC breach related to bug #53437
...
days and special_amount properties are exported as int again
2013-06-10 17:48:13 +02:00
Xinchen Hui
a9d005c04e
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
Zend/zend_compile.c
2013-06-10 21:31:25 +08:00
Xinchen Hui
d8792d87cf
Fixed bug #64988 (Class loading order affects E_STRICT warning)
2013-06-10 21:26:11 +08:00
Jakub Vrana
46d3738d0a
Fix image method signatures
2013-06-10 02:24:03 -07:00
Dmitry Stogov
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
Dmitry Stogov
ed0767f5d4
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' 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.
Fix spelling and correct typo.
2013-06-10 12:59:09 +04:00
Dmitry Stogov
ef20fdb338
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed test script
2013-06-10 12:55:51 +04:00
Dmitry Stogov
f68b8a5e74
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed test script
2013-06-10 12:54:54 +04:00
Stanislav Malyshev
7a2d9690fe
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
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
2013-06-10 01:53:29 -07:00
Dmitry Stogov
f5f6404260
Fixed test script
2013-06-10 12:53:19 +04:00
Antonio Diaz Ruiz
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
Stanislav Malyshev
20df5f8f24
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix spelling and correct typo.
2013-06-10 01:42:32 -07:00
Carson McDonald
f4e3c7ab7c
Fix spelling and correct typo.
2013-06-10 01:42:27 -07:00
Stanislav Malyshev
de1688d16e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix spelling and correct typo.
2013-06-10 01:41:16 -07:00
Carson McDonald
b8cf17635e
Fix spelling and correct typo.
2013-06-10 01:40:41 -07:00
Dmitry Stogov
731b4a3fa4
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Callback has to be restored in MSHUTDOWN
2013-06-10 12:34:08 +04:00
Dmitry Stogov
336a8e1943
Callback has to be restored in MSHUTDOWN
2013-06-10 12:32:53 +04:00
Dmitry Stogov
53e6529203
Fixed comments
2013-06-10 12:05:20 +04:00
Dmitry Stogov
23a9bb09ba
Avoid multiple allocations of the same key in different processes
2013-06-10 11:43:03 +04:00
Dmitry Stogov
540488bf55
Compact HashTables before storing them in shared memory
2013-06-10 11:22:19 +04:00
Dmitry Stogov
2e9d3e8b39
Use size_t instead of int
2013-06-10 10:36:35 +04:00
Xinchen Hui
8ae43caeee
Update NEWS
2013-06-09 22:26:07 +08:00
Xinchen Hui
3f229f4364
Merge branch 'PHP-5.4' into PHP-5.5
2013-06-09 22:25:49 +08:00
Xinchen Hui
fdd7379686
Update NEWs
2013-06-09 22:25:28 +08:00
Xinchen Hui
f338510c94
Merge branch 'PHP-5.3' into PHP-5.4
2013-06-09 22:25:07 +08:00
Xinchen Hui
75c57122e3
Fixed bug #64997 (Segfault while using RecursiveIteratorIterator on 64-bits systems)
2013-06-09 22:24:48 +08:00
Xinchen Hui
b839e6921d
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
Zend/zend_vm_def.h
2013-06-09 14:25:53 +08:00
Xinchen Hui
e14800dd46
Fixed merge wrongly
2013-06-09 14:24:05 +08:00
Xinchen Hui
6139358804
Update NEWS
2013-06-09 13:49:43 +08:00
Xinchen Hui
f372e00332
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
Zend/zend_vm_def.h
2013-06-09 13:49:26 +08:00
Xinchen Hui
3cc891bf3a
Update NEWS
2013-06-09 13:39:40 +08:00
Xinchen Hui
ab22fda7e5
Merge branch 'PHP-5.3' into PHP-5.4
2013-06-09 13:35:45 +08:00
Xinchen Hui
e8f004d542
Fixed bug #64966 (segfault in zend_do_fcall_common_helper_SPEC)
2013-06-09 13:20:40 +08:00
Stanislav Malyshev
bccacb6308
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix 5.4.16 date
2013-06-06 13:27:25 -07:00
Stanislav Malyshev
a7e25bdd48
fix 5.4.16 date
2013-06-06 13:27:04 -07:00
Anatol Belski
25980d4db5
fix NEWS
2013-06-06 18:57:20 +02:00
Anatol Belski
f47e879235
updated NEWS
2013-06-06 18:53:22 +02:00
Anatol Belski
bbdbef40db
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated NEWS
Fixed bug #64934 Apache2 TS crash with get_browser()
2013-06-06 18:52:39 +02:00
Anatol Belski
4b96b8f909
updated NEWS
2013-06-06 18:52:05 +02:00