Xinchen Hui
127c78cb76
Merge branch 'PHP-5.4' into PHP-5.5
2013-03-28 23:23:07 +08:00
Xinchen Hui
ef93a93ee2
Attempt to fix SKIP
2013-03-28 23:22:20 +08:00
Xinchen Hui
7dd661d0cd
Merge branch 'PHP-5.4' into PHP-5.5
2013-03-28 14:35:02 +08:00
Xinchen Hui
ab089611e0
Fix test on Mac (\D shows up)
2013-03-28 14:34:08 +08:00
Xinchen Hui
ae71c1d9aa
Merge branch 'PHP-5.4' into PHP-5.5
2013-03-28 13:54:37 +08:00
Xinchen Hui
467cd6a60f
Add test for #64529
2013-03-28 13:45:42 +08:00
Johannes Schlüter
d900382814
Merge branch 'PHP-5.4' into PHP-5.5
2013-03-24 17:33:17 +01:00
Johannes Schlüter
6f560b0487
Document embedded server options in manpage
2013-03-24 17:32:30 +01:00
Johannes Schlüter
de71f435d8
Merge branch 'PHP-5.3' into PHP-5.4
2013-03-24 17:32:00 +01:00
Johannes Schlüter
66682f5abe
It's 2013, even for a manpage
2013-03-24 17:31:29 +01:00
Pierre Joye
0179284bfb
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- add reminder for checking return values
2013-03-24 13:29:16 +01:00
Pierre Joye
bb18fa448c
- add reminder for checking return values
2013-03-24 13:27:00 +01:00
Anatol Belski
ec26141f92
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- fix x64 issues on windows with the various time types (overflow, signed and unsigned bits ops, etc.) causing crashes on start, error or log, must be done in win32/time.c for some of these functions too
2013-03-23 22:43:58 +01:00
Pierre Joye
3af4896837
- fix x64 issues on windows with the various time types (overflow, signed and unsigned bits ops, etc.) causing crashes on start, error or log, must be done in win32/time.c for some of these functions too
...
Signed-off-by: Anatol Belski <ab@php.net>
2013-03-23 22:42:03 +01:00
Keyur Govande
a0a995cff3
Support for CLI process title ( https://wiki.php.net/rfc/cli_process_title )
...
A new commit into branch 5.5
2013-03-07 18:54:34 +00:00
Stanislav Malyshev
c877fcf6ec
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Added HTTP codes as of RFC 6585
2013-02-17 01:20:14 -08:00
Jonh Wendell
59b016192d
Added HTTP codes as of RFC 6585
...
Added descriptions for the new HTTP codes:
- 428 Precondition Required
- 429 Too Many Requests
- 431 Request Header Fields Too Large
- 511 Network Authentication Required
2013-02-17 01:18:40 -08:00
Remi Collet
5d3501c7d4
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #64128 buit-in web server is broken on ppc64.
2013-02-01 19:26:11 +01:00
Remi Collet
0cea9e6843
Fixed bug #64128 buit-in web server is broken on ppc64.
...
fdset management using bit operator is broken on non-x86 arch
and cause built-in server the enter an infinite loop of "select"
and never handle any request.
2013-02-01 19:23:25 +01:00
Lars Strojny
785e66adb5
PR #260 : Update css for 404 pages to feel more up to date and have a consistent layout across browsers
2013-01-14 20:43:14 +01:00
Stanislav Malyshev
80a9a80a52
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Bug #43177 : If an eval() has a parse error, the overall exit status and return code should not be affected.
fix NEWS
Conflicts:
main/main.c
2013-01-01 21:20:35 -08:00
Stanislav Malyshev
36e19c9cab
Bug #43177 : If an eval() has a parse error, the overall exit status and return code should not be affected.
...
Without this fix, a webpage using eval() may return code 500. That might display
fine and the 500 go unnoticed, but using AJAX or wget, the 500 will cause problems.
2013-01-01 21:18:59 -08:00
Xinchen Hui
a666285bc2
Happy New Year
2013-01-01 16:37:09 +08:00
Xinchen Hui
0a7395e009
Happy New Year
2013-01-01 16:28:54 +08:00
Xinchen Hui
a2045ff332
Happy New Year~
2013-01-01 16:02:16 +08:00
Lars Strojny
aaa5e42177
Merge branch 'PHP-5.4' into PHP-5.5
2012-12-14 14:56:25 +01:00
pascalc
d813af0618
update test for supported Mime Types checking
2012-12-14 13:59:06 +01:00
pascalc
e5b1ebc082
update list of common Mime Types in PHP development server to support Web audio/video formats (Webm ,and Ogg containers) + have jpeg mime types listed together
2012-12-14 13:59:01 +01:00
Anatoliy Belsky
01f1894194
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed test sapi/cli/tests/006.phpt
2012-11-14 16:23:36 +01:00
Anatoliy Belsky
3d82f16c7d
Fixed test sapi/cli/tests/006.phpt
...
Third param in preg_match_all() is optional for a while )
2012-11-14 16:20:59 +01:00
Xinchen Hui
610c7fbe7b
Remove executable permission on phpt
2012-10-10 10:27:49 +08:00
Xinchen Hui
ea441bd08d
Implemented FR #63242 (Default error page in PHP built-in web server uses outdated html/css)
2012-10-10 17:23:30 +08:00
Xinchen Hui
e081c55fb5
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-10 10:31:31 +08:00
Xinchen Hui
7a7b2a0642
Merge branch 'PHP-5.4'
2012-10-10 17:24:40 +08:00
Xinchen Hui
4b152e5470
Merge branch 'PHP-5.4'
2012-10-10 10:32:38 +08:00
Lars Strojny
d0e96a5575
Merge branch 'PHP-5.4'
2012-09-18 22:17:36 +02:00
Lars Strojny
aa133ea282
Merged GitHub PR #190 : Support for the HTTP PATCH method in CLI webserver
2012-09-18 22:16:51 +02:00
Stanislav Malyshev
6cc9d99dc2
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Respond with 501 to unknown request methods
2012-09-15 23:11:55 -07:00
Niklas Lindgren
27542db4e7
Respond with 501 to unknown request methods
...
Fixed typo
Moved 501 response from dispatch to event_read_request
Return return value of send_error_page
2012-09-15 23:11:12 -07:00
Xinchen Hui
63d9c1f40b
Merge branch 'PHP-5.4'
...
Conflicts:
sapi/litespeed/lsapi_main.c
2012-09-05 23:20:42 +08:00
Xinchen Hui
9d44ff640c
Merge branch 'PHP-5.3' into PHP-5.4
...
Conflicts:
ext/interbase/interbase.rc
2012-09-05 23:11:19 +08:00
Felipe Pena
f84947c688
Merge branch 'PHP-5.4'
...
* PHP-5.4:
- Fixed bug #62829 (stdint.h included on platform where HAVE_STDINT_H is not set)
2012-08-16 15:45:40 -03:00
Felipe Pena
2e1d31d123
- Fixed bug #62829 (stdint.h included on platform where HAVE_STDINT_H is not set)
2012-08-16 15:45:21 -03:00
Stanislav Malyshev
c9eb64127e
Merge branch 'pull-request/132'
...
* pull-request/132:
OK, bye bye JavaScript, let's just include credits before license
Nicer (JSLint-compliant!) credits reveal JavaScript
Removed now-unnecessary expose_php checks for logo
Fixed small misalignment in prev commit
Removed Logo GUIDs and replaced with Data URIs and div hidden with JS
2012-08-05 21:15:53 -07:00
Xinchen Hui
d1f0662e4d
Fixed bug #62725 (Calling exit() in a shutdown function does not return the exit value)
...
The fix is make 5.4 behavior consistent with 5.3
2012-08-02 23:03:38 +08:00
Xinchen Hui
36100060b3
Sleep a little bit more, in some slow machine (like gcov), it will take a little more time to setup server
2012-08-01 23:54:01 +08:00
Xinchen Hui
0988ae3c43
Implemented FR #62700 (have the console output 'Listening on http://localhost:8000 ')
2012-07-31 22:42:28 +08:00
Johannes Schlüter
860b3ffe75
Fix Bug #62612 readline extension compilation fails
2012-07-22 23:28:32 +02:00
Xinchen Hui
a88eca53f7
Improve error message for ssl request
2012-07-22 19:20:23 +08:00
Andrew Faulds
d12f8d6790
Removed Logo GUIDs and replaced with Data URIs and div hidden with JS
...
- removed php_logo_guid()
- removed php_egg_logo_guid()
- removed php_real_logo_guid()
- removed zend_logo_guid()
- removed logo GUID handling
- removed logo GUIDs from source
- added logo data URIs instead for phpinfo()
- added credits to phpinfo() page, but hidden by default
2012-07-14 21:44:21 +01:00