Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77c2655a authored by Maurice Chu's avatar Maurice Chu
Browse files

Add method name to curl output 

Backporting change made to AndroidHttpClient.java from
CL I0f3819e84542023fca65ec4a29534ef32e877570.

Bug: 7499444
Change-Id: Ie67d2917fa378afb00ec4bd7c3de238f48f7c6af
parent bb89702a

core/java/android/net/http/AndroidHttpClient.java

+21 −15
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.net.http;



import com.android.internal.http.HttpDateTime;



import org.apache.http.Header;

import org.apache.http.HttpEntity;

import org.apache.http.HttpEntityEnclosingRequest;
@@ -25,18 +26,18 @@ import org.apache.http.HttpHost; 
import org.apache.http.HttpRequest;

import org.apache.http.HttpRequestInterceptor;

import org.apache.http.HttpResponse;

import org.apache.http.entity.AbstractHttpEntity;

import org.apache.http.entity.ByteArrayEntity;

import org.apache.http.client.ClientProtocolException;

import org.apache.http.client.HttpClient;

import org.apache.http.client.ResponseHandler;

import org.apache.http.client.ClientProtocolException;

import org.apache.http.client.protocol.ClientContext;

import org.apache.http.client.methods.HttpUriRequest;

import org.apache.http.client.params.HttpClientParams;

import org.apache.http.client.protocol.ClientContext;

import org.apache.http.conn.ClientConnectionManager;

import org.apache.http.conn.scheme.PlainSocketFactory;

import org.apache.http.conn.scheme.Scheme;

import org.apache.http.conn.scheme.SchemeRegistry;

import org.apache.http.entity.AbstractHttpEntity;

import org.apache.http.entity.ByteArrayEntity;

import org.apache.http.impl.client.DefaultHttpClient;

import org.apache.http.impl.client.RequestWrapper;

import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;
@@ -44,26 +45,26 @@ import org.apache.http.params.BasicHttpParams; 
import org.apache.http.params.HttpConnectionParams;

import org.apache.http.params.HttpParams;

import org.apache.http.params.HttpProtocolParams;

import org.apache.http.protocol.BasicHttpContext;

import org.apache.http.protocol.BasicHttpProcessor;

import org.apache.http.protocol.HttpContext;

import org.apache.http.protocol.BasicHttpContext;



import java.io.IOException;

import java.io.InputStream;

import java.io.ByteArrayOutputStream;

import java.io.OutputStream;

import java.util.zip.GZIPInputStream;

import java.util.zip.GZIPOutputStream;

import java.net.URI;



import android.content.Context;

import android.content.ContentResolver;

import android.content.Context;

import android.net.SSLCertificateSocketFactory;

import android.net.SSLSessionCache;

import android.os.Looper;

import android.util.Base64;

import android.util.Log;



import java.io.ByteArrayOutputStream;

import java.io.IOException;

import java.io.InputStream;

import java.io.OutputStream;

import java.net.URI;

import java.util.zip.GZIPInputStream;

import java.util.zip.GZIPOutputStream;



/**

 * Implementation of the Apache {@link DefaultHttpClient} that is configured with

 * reasonable default settings and registered schemes for Android, and
@@ -405,6 +406,11 @@ public final class AndroidHttpClient implements HttpClient { 


        builder.append("curl ");



        // add in the method

        builder.append("-X ");

        builder.append(request.getMethod());

        builder.append(" ");



        for (Header header: request.getAllHeaders()) {

            if (!logAuthToken

                    && (header.getName().equals("Authorization") ||