You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by re...@locus.apache.org on 2000/12/06 05:56:33 UTC
cvs commit: jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods WebdavMethodBase.java
remm 00/12/05 20:56:33
Modified: src/webdav/client/src/org/apache/webdav/lib/methods
WebdavMethodBase.java
Log:
- Fix for a showstopper which took me a while to find. Basically, if the
request had to be resubmitted, the response headers were merged and sent
back as part of the second request. Of course, it caused random problems.
Revision Changes Path
1.5 +13 -9 jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/WebdavMethodBase.java
Index: WebdavMethodBase.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/WebdavMethodBase.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WebdavMethodBase.java 2000/12/04 06:32:42 1.4
+++ WebdavMethodBase.java 2000/12/06 04:56:32 1.5
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/WebdavMethodBase.java,v 1.4 2000/12/04 06:32:42 bcholmes Exp $
- * $Revision: 1.4 $
- * $Date: 2000/12/04 06:32:42 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/WebdavMethodBase.java,v 1.5 2000/12/06 04:56:32 remm Exp $
+ * $Revision: 1.5 $
+ * $Date: 2000/12/06 04:56:32 $
*
* ====================================================================
*
@@ -326,6 +326,9 @@
* <CODE>generateHeaders(String, State)</CODE> method.
*/
public void generateHeaders(State state) {
+
+ generateHeaders("default", state);
+
}
@@ -336,27 +339,28 @@
* @param state State token
*/
public void generateHeaders(String host, State state) {
-
+
+ headers.clear();
+
// Default implementation adds the lock token headers if necessary
this.state = state;
-
- generateHeaders(state);
-
+
// good practice to provide a user-agent indicator
if (!headers.containsKey("user-agent")) {
headers.put("user-agent", WebdavClient.USER_AGENT);
}
-
+
if (!headers.containsKey("host")) {
headers.put("host", new Header("host", host));
}
-
+
// add the cookies
if (!headers.containsKey("cookie")) {
Vector cookies = state.getCookies();
headers.put("cookie",
Cookie.createCookieHeader(host, getPath(), cookies));
}
+
}