Index: java/org/apache/commons/httpclient/methods/EntityEnclosingMethod.java =================================================================== RCS file: /home/cvspublic/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/methods/EntityEnclosingMethod.java,v retrieving revision 1.12 diff -u -r1.12 EntityEnclosingMethod.java --- java/org/apache/commons/httpclient/methods/EntityEnclosingMethod.java 6 Mar 2003 07:49:03 -0000 1.12 +++ java/org/apache/commons/httpclient/methods/EntityEnclosingMethod.java 10 Mar 2003 17:43:21 -0000 @@ -1,5 +1,5 @@ /* - * $Header: /home/cvspublic/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/methods/EntityEnclosingMethod.java,v 1.12 2003/03/06 07:49:03 olegk Exp $ + * $Header: /home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/methods/EntityEnclosingMethod.java,v 1.12 2003/03/06 07:49:03 olegk Exp $ * $Revision: 1.12 $ * $Date: 2003/03/06 07:49:03 $ * @@ -363,7 +363,7 @@ // See if the expect header should be sent // = HTTP/1.1 or higher // = request body present - if (getUseExpectHeader() && isHttp11() + if (getUseExpectHeader() && isHttp11() && !conn.isProxied() && ((this.requestBodyStream != null) || this.buffer != null)) { if (!headerPresent) { setRequestHeader("Expect", "100-continue"); Index: java/org/apache/commons/httpclient/methods/MultipartPostMethod.java =================================================================== RCS file: /home/cvspublic/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/methods/MultipartPostMethod.java,v retrieving revision 1.13 diff -u -r1.13 MultipartPostMethod.java --- java/org/apache/commons/httpclient/methods/MultipartPostMethod.java 6 Mar 2003 07:49:03 -0000 1.13 +++ java/org/apache/commons/httpclient/methods/MultipartPostMethod.java 10 Mar 2003 17:43:21 -0000 @@ -1,5 +1,5 @@ /* - * $Header: /home/cvspublic/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/methods/MultipartPostMethod.java,v 1.13 2003/03/06 07:49:03 olegk Exp $ + * $Header: /home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/methods/MultipartPostMethod.java,v 1.13 2003/03/06 07:49:03 olegk Exp $ * $Revision: 1.13 $ * $Date: 2003/03/06 07:49:03 $ * @@ -252,7 +252,7 @@ setRequestHeader("Content-Type", buffer.toString()); } boolean headerPresent = (getRequestHeader("Expect") != null); - if (getUseExpectHeader() && isHttp11()) { + if (getUseExpectHeader() && isHttp11() && !conn.isProxied()) { if (!headerPresent) { setRequestHeader("Expect", "100-continue"); }