• R/O
  • SSH
  • HTTPS

webserver: Commit


Commit MetaInfo

Revision52 (tree)
Time2010-10-11 21:08:38
Authorhoritaku

Log Message

修正

Change Summary

Incremental Difference

--- branch/Basic 0.2x/src/servercore/http/HttpRequest.java (revision 51)
+++ branch/Basic 0.2x/src/servercore/http/HttpRequest.java (revision 52)
@@ -33,6 +33,18 @@
3333 reqest_method = METHOD.GET;
3434 } else if("POST".equals(method)) {
3535 reqest_method = METHOD.POST;
36+ } else if("PUT".equals(method)) {
37+ reqest_method = METHOD.PUT;
38+ } else if("DELETE".equals(method)) {
39+ reqest_method = METHOD.DELETE;
40+ } else if("HEAD".equals(method)) {
41+ reqest_method = METHOD.HEAD;
42+ } else if("OPTION".equals(method)) {
43+ reqest_method = METHOD.OPTION;
44+ } else if("TRACE".equals(method)) {
45+ reqest_method = METHOD.TRACE;
46+ } else if("CONNECT".equals(method)) {
47+ reqest_method = METHOD.CONNECT;
3648 }
3749 }
3850 public METHOD getMethod() {
--- branch/Basic 0.2x/src/servercore/job/JobWorker.java (revision 51)
+++ branch/Basic 0.2x/src/servercore/job/JobWorker.java (revision 52)
@@ -116,6 +116,9 @@
116116 finished = true;
117117 break;
118118 }
119+ } else {
120+ finished = true;
121+ break;
119122 }
120123 } else {
121124 String[] set = line.split("\\: ");
--- branch/Basic 0.2x/src/servercore/job/GeneratePage.java (revision 51)
+++ branch/Basic 0.2x/src/servercore/job/GeneratePage.java (revision 52)
@@ -42,7 +42,8 @@
4242 res.setStatusCore(404);
4343 } catch (Exception e) {
4444 res.setStatusCore(500);
45- res.setResponseStr(e.getMessage());
45+ String msg = e.getMessage() == null ? e.toString() : e.getMessage();
46+ res.setResponseStr(msg);
4647 e.printStackTrace();
4748 }
4849 return res;
Show on old repository browser