Hi J�rgen!
Bad news: We have a second branch now:
SLIDE_2_1_RELEASE_BRANCH
The new one is for the 2.1 release. Would you consider committing those bug fixes to the 2.1 branch as well? Or have you omitted the new branch intentionally?
Oliver
[EMAIL PROTECTED] wrote:
juergen 2004/08/10 09:03:02
Modified: src/webdav/server/org/apache/slide/webdav/method
LockMethod.java OptionsMethod.java PutMethod.java
Log:
Make lock, options and put chunking aware.
Revision Changes Path
1.70 +4 -4 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/LockMethod.java
Index: LockMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/LockMethod.java,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- LockMethod.java 3 Aug 2004 09:37:48 -0000 1.69
+++ LockMethod.java 10 Aug 2004 16:03:01 -0000 1.70
@@ -175,7 +175,7 @@
lockDuration = requestHeaders.getTimeout(MAX_TIMEOUT);
- if (req.getContentLength() > 0) {
+ if (req.getContentLength() != 0) {
parseLockInfo();
} else {
lockType = LOCK_REFRESH;
1.45 +4 -4 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/OptionsMethod.java
Index: OptionsMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/OptionsMethod.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- OptionsMethod.java 2 Aug 2004 16:36:01 -0000 1.44
+++ OptionsMethod.java 10 Aug 2004 16:03:01 -0000 1.45
@@ -86,7 +86,7 @@
protected void parseRequest() throws WebdavException {
- if( req.getContentLength() > 0 ) {
+ if( req.getContentLength() != 0 ) {
try {
Iterator i = parseRequestContent(E_OPTIONS).getChildren().iterator();
while( i.hasNext() ) {
1.82 +9 -4 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PutMethod.java
Index: PutMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PutMethod.java,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- PutMethod.java 3 Aug 2004 09:37:47 -0000 1.81
+++ PutMethod.java 10 Aug 2004 16:03:01 -0000 1.82
@@ -214,10 +214,15 @@
NodeRevisionContent revisionContent =
new NodeRevisionContent();
//revisionContent.setContent(req.getReader());
+ revisionContent.setContent(req.getInputStream());
// Get content length
- revisionDescriptor.setContentLength(req.getContentLength());
+ int contentLength = req.getContentLength();
+ if (contentLength == (-1)) {
+ contentLength = revisionContent.getContentBytes().length;
+ }
+ revisionDescriptor.setContentLength(contentLength);
// Last modification date
revisionDescriptor.setLastModified(new Date());
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
