Wed, 31 Dec 2014 07:22:50 +0100
Correct previous dual key logic pending first delivery installment.
michael@0 | 1 | /* |
michael@0 | 2 | * ==================================================================== |
michael@0 | 3 | * Licensed to the Apache Software Foundation (ASF) under one |
michael@0 | 4 | * or more contributor license agreements. See the NOTICE file |
michael@0 | 5 | * distributed with this work for additional information |
michael@0 | 6 | * regarding copyright ownership. The ASF licenses this file |
michael@0 | 7 | * to you under the Apache License, Version 2.0 (the |
michael@0 | 8 | * "License"); you may not use this file except in compliance |
michael@0 | 9 | * with the License. You may obtain a copy of the License at |
michael@0 | 10 | * |
michael@0 | 11 | * http://www.apache.org/licenses/LICENSE-2.0 |
michael@0 | 12 | * |
michael@0 | 13 | * Unless required by applicable law or agreed to in writing, |
michael@0 | 14 | * software distributed under the License is distributed on an |
michael@0 | 15 | * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY |
michael@0 | 16 | * KIND, either express or implied. See the License for the |
michael@0 | 17 | * specific language governing permissions and limitations |
michael@0 | 18 | * under the License. |
michael@0 | 19 | * ==================================================================== |
michael@0 | 20 | * |
michael@0 | 21 | * This software consists of voluntary contributions made by many |
michael@0 | 22 | * individuals on behalf of the Apache Software Foundation. For more |
michael@0 | 23 | * information on the Apache Software Foundation, please see |
michael@0 | 24 | * <http://www.apache.org/>. |
michael@0 | 25 | * |
michael@0 | 26 | */ |
michael@0 | 27 | |
michael@0 | 28 | package ch.boye.httpclientandroidlib.client.protocol; |
michael@0 | 29 | |
michael@0 | 30 | import java.io.IOException; |
michael@0 | 31 | |
michael@0 | 32 | import ch.boye.httpclientandroidlib.androidextra.HttpClientAndroidLog; |
michael@0 | 33 | /* LogFactory removed by HttpClient for Android script. */ |
michael@0 | 34 | import ch.boye.httpclientandroidlib.annotation.Immutable; |
michael@0 | 35 | |
michael@0 | 36 | import ch.boye.httpclientandroidlib.HttpException; |
michael@0 | 37 | import ch.boye.httpclientandroidlib.HttpRequest; |
michael@0 | 38 | import ch.boye.httpclientandroidlib.HttpRequestInterceptor; |
michael@0 | 39 | import ch.boye.httpclientandroidlib.conn.HttpRoutedConnection; |
michael@0 | 40 | import ch.boye.httpclientandroidlib.conn.routing.HttpRoute; |
michael@0 | 41 | import ch.boye.httpclientandroidlib.protocol.ExecutionContext; |
michael@0 | 42 | import ch.boye.httpclientandroidlib.protocol.HTTP; |
michael@0 | 43 | import ch.boye.httpclientandroidlib.protocol.HttpContext; |
michael@0 | 44 | |
michael@0 | 45 | /** |
michael@0 | 46 | * This protocol interceptor is responsible for adding <code>Connection</code> |
michael@0 | 47 | * or <code>Proxy-Connection</code> headers to the outgoing requests, which |
michael@0 | 48 | * is essential for managing persistence of <code>HTTP/1.0</code> connections. |
michael@0 | 49 | * |
michael@0 | 50 | * @since 4.0 |
michael@0 | 51 | */ |
michael@0 | 52 | @Immutable |
michael@0 | 53 | public class RequestClientConnControl implements HttpRequestInterceptor { |
michael@0 | 54 | |
michael@0 | 55 | public HttpClientAndroidLog log = new HttpClientAndroidLog(getClass()); |
michael@0 | 56 | |
michael@0 | 57 | private static final String PROXY_CONN_DIRECTIVE = "Proxy-Connection"; |
michael@0 | 58 | |
michael@0 | 59 | public RequestClientConnControl() { |
michael@0 | 60 | super(); |
michael@0 | 61 | } |
michael@0 | 62 | |
michael@0 | 63 | public void process(final HttpRequest request, final HttpContext context) |
michael@0 | 64 | throws HttpException, IOException { |
michael@0 | 65 | if (request == null) { |
michael@0 | 66 | throw new IllegalArgumentException("HTTP request may not be null"); |
michael@0 | 67 | } |
michael@0 | 68 | |
michael@0 | 69 | String method = request.getRequestLine().getMethod(); |
michael@0 | 70 | if (method.equalsIgnoreCase("CONNECT")) { |
michael@0 | 71 | request.setHeader(PROXY_CONN_DIRECTIVE, HTTP.CONN_KEEP_ALIVE); |
michael@0 | 72 | return; |
michael@0 | 73 | } |
michael@0 | 74 | |
michael@0 | 75 | // Obtain the client connection (required) |
michael@0 | 76 | HttpRoutedConnection conn = (HttpRoutedConnection) context.getAttribute( |
michael@0 | 77 | ExecutionContext.HTTP_CONNECTION); |
michael@0 | 78 | if (conn == null) { |
michael@0 | 79 | this.log.debug("HTTP connection not set in the context"); |
michael@0 | 80 | return; |
michael@0 | 81 | } |
michael@0 | 82 | |
michael@0 | 83 | HttpRoute route = conn.getRoute(); |
michael@0 | 84 | |
michael@0 | 85 | if (route.getHopCount() == 1 || route.isTunnelled()) { |
michael@0 | 86 | if (!request.containsHeader(HTTP.CONN_DIRECTIVE)) { |
michael@0 | 87 | request.addHeader(HTTP.CONN_DIRECTIVE, HTTP.CONN_KEEP_ALIVE); |
michael@0 | 88 | } |
michael@0 | 89 | } |
michael@0 | 90 | if (route.getHopCount() == 2 && !route.isTunnelled()) { |
michael@0 | 91 | if (!request.containsHeader(PROXY_CONN_DIRECTIVE)) { |
michael@0 | 92 | request.addHeader(PROXY_CONN_DIRECTIVE, HTTP.CONN_KEEP_ALIVE); |
michael@0 | 93 | } |
michael@0 | 94 | } |
michael@0 | 95 | } |
michael@0 | 96 | |
michael@0 | 97 | } |