hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r230845 - in /jakarta/httpclient/trunk/http-common/src: examples/org/apache/http/examples/ElementalHttpEchoServer.java java/org/apache/http/HttpServerConnection.java java/org/apache/http/impl/DefaultHttpServerConnection.java
Date Mon, 08 Aug 2005 18:29:19 GMT
Author: olegk
Date: Mon Aug  8 11:29:10 2005
New Revision: 230845

URL: http://svn.apache.org/viewcvs?rev=230845&view=rev
Log:
Server-side 'expect: 100-continue' API simplified

Modified:
    jakarta/httpclient/trunk/http-common/src/examples/org/apache/http/examples/ElementalHttpEchoServer.java
    jakarta/httpclient/trunk/http-common/src/java/org/apache/http/HttpServerConnection.java
    jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/DefaultHttpServerConnection.java

Modified: jakarta/httpclient/trunk/http-common/src/examples/org/apache/http/examples/ElementalHttpEchoServer.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/examples/org/apache/http/examples/ElementalHttpEchoServer.java?rev=230845&r1=230844&r2=230845&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/examples/org/apache/http/examples/ElementalHttpEchoServer.java
(original)
+++ jakarta/httpclient/trunk/http-common/src/examples/org/apache/http/examples/ElementalHttpEchoServer.java
Mon Aug  8 11:29:10 2005
@@ -240,7 +240,6 @@
                             ack.getParams().setDefaults(this.params);
                             ack.setStatusCode(HttpStatus.SC_CONTINUE);
                             this.conn.sendResponse(ack);
-                            this.conn.continueRequest((HttpEntityEnclosingRequest) request);
                     	}
                     }
                     System.out.println("Request received");

Modified: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/HttpServerConnection.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/java/org/apache/http/HttpServerConnection.java?rev=230845&r1=230844&r2=230845&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/java/org/apache/http/HttpServerConnection.java
(original)
+++ jakarta/httpclient/trunk/http-common/src/java/org/apache/http/HttpServerConnection.java
Mon Aug  8 11:29:10 2005
@@ -49,8 +49,6 @@
     
     HttpRequest receiveRequest(HttpParams params) throws HttpException, IOException;
 
-    void continueRequest(HttpEntityEnclosingRequest request) throws HttpException, IOException;
-
     void sendResponse(HttpResponse response) throws HttpException, IOException;
     
 }

Modified: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/DefaultHttpServerConnection.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/DefaultHttpServerConnection.java?rev=230845&r1=230844&r2=230845&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/DefaultHttpServerConnection.java
(original)
+++ jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/DefaultHttpServerConnection.java
Mon Aug  8 11:29:10 2005
@@ -34,7 +34,6 @@
 
 import org.apache.http.ConnectionClosedException;
 import org.apache.http.Header;
-import org.apache.http.HttpEntityEnclosingRequest;
 import org.apache.http.HttpException;
 import org.apache.http.HttpMutableEntity;
 import org.apache.http.HttpMutableEntityEnclosingRequest;
@@ -97,10 +96,6 @@
         receiveRequestHeaders(request);
 
         if (request instanceof HttpMutableEntityEnclosingRequest) {
-        	if (((HttpMutableEntityEnclosingRequest) request).expectContinue()) {
-            	// return and let the caller validate the request
-                return request;
-        	}
             receiveRequestBody((HttpMutableEntityEnclosingRequest) request);
         }
         return request;
@@ -140,13 +135,6 @@
         request.setEntity(entity);
     }
     
-    public void continueRequest(final HttpEntityEnclosingRequest request) 
-    		throws HttpException, IOException {
-    	if (request.expectContinue() && request.getEntity() == null) {
-            receiveRequestBody((HttpMutableEntityEnclosingRequest) request);
-    	}
-	}
-
 	public void sendResponse(final HttpResponse response) 
             throws HttpException, IOException {
         if (response == null) {



Mime
View raw message