
Sync 'next' with v0.5.7
Reviewed-by: insanehong
@2706761709972792ffb9850e71199cccc85a34c3
--- app/controllers/SvnApp.java
+++ app/controllers/SvnApp.java
... | ... | @@ -126,7 +126,7 @@ |
126 | 126 |
|
127 | 127 |
// Send the response. |
128 | 128 |
UserApp.currentUser().visits(project); |
129 |
- return sendResponse(status, response.getInputStream()); |
|
129 |
+ return sendResponse(request().method(), status, response.getInputStream()); |
|
130 | 130 |
} |
131 | 131 |
|
132 | 132 |
private static PlayServletResponse startDavService(final String ownerName, String pathInfo) throws IOException { |
... | ... | @@ -154,9 +154,12 @@ |
154 | 154 |
return response; |
155 | 155 |
} |
156 | 156 |
|
157 |
- private static Result sendResponse(int statusCode, PipedInputStream input) { |
|
158 |
- if (statusCode < 200 || statusCode == 204 || statusCode == 304) { |
|
159 |
- // 1xx, 204 and 304 MUST NOT include message body. |
|
157 |
+ private static Result sendResponse(String requestMethod, int statusCode, |
|
158 |
+ PipedInputStream input) { |
|
159 |
+ if (statusCode < 200 || statusCode == 204 || statusCode == 304 || |
|
160 |
+ requestMethod.toUpperCase().equals("HEAD")) { |
|
161 |
+ // a response requested by HEAD method and/or whose status code is |
|
162 |
+ // 1xx, 204 or 304 MUST NOT include message body. |
|
160 | 163 |
return status(statusCode); |
161 | 164 |
} else if (statusCode == 205) { |
162 | 165 |
// 205 MUST include message body of zero length. |
--- conf/messages
+++ conf/messages
... | ... | @@ -258,7 +258,7 @@ |
258 | 258 |
issue.voters.more = and {0} others |
259 | 259 |
issue.watch.start =Now you will get notifications about this issue |
260 | 260 |
label = Label |
261 |
-label.add = Add aabel |
|
261 |
+label.add = Add label |
|
262 | 262 |
label.addNewCategory = Add new category |
263 | 263 |
label.category = Category |
264 | 264 |
label.confirm.delete = Once you delete this label, those attached to issues will also be removed. Do you still want to delete the label? |
--- conf/version.conf
+++ conf/version.conf
... | ... | @@ -1,1 +1,1 @@ |
1 |
-app.version="0.5.6" |
|
1 |
+app.version="0.5.7" |
+++ docs/ko/relnotes/0.5.7.txt
... | ... | @@ -0,0 +1,8 @@ |
1 | +Yobi v0.5.7 릴리즈 노트 | |
2 | +======================= | |
3 | + | |
4 | +v0.5.6 이후 버그수정 | |
5 | +-------------------- | |
6 | + | |
7 | +* SVN 커밋이 안되는 문제 (serf를 사용하는 SVN 클라이언트에서만) | |
8 | +* 사이트 메인에서 이벤트 목록이 잘못 정렬되는 문제 |
+++ docs/relnotes/0.5.7.txt
... | ... | @@ -0,0 +1,8 @@ |
1 | +Yobi v0.5.7 Release Notes | |
2 | +========================= | |
3 | + | |
4 | +Fixes since v0.5.6 | |
5 | +------------------ | |
6 | + | |
7 | +* SVN commit did not work for clients using serf. | |
8 | +* Ordering of event list in the main page was incorrect. |
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?