Changeset 846 for trunk/src/network/access/qhttpnetworkrequest.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/network/access/qhttpnetworkrequest.cpp (modified) (8 diffs)

trunk/src/network/access/qhttpnetworkrequest.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -50 +50 @@
         QHttpNetworkRequest::Priority pri, const QUrl &newUrl)
     : QHttpNetworkHeaderPrivate(newUrl), operation(op), priority(pri), uploadByteDevice(0),
-      autoDecompress(false), pipeliningAllowed(false)
+      autoDecompress(false), pipeliningAllowed(false)
 {
 }
@@ -62 +62 @@
     autoDecompress = other.autoDecompress;
     pipeliningAllowed = other.pipeliningAllowed;
+
+
 }
 
@@ -77 +79 @@
 QByteArray QHttpNetworkRequestPrivate::methodName() const
 {
-    QByteArray ba;
     switch (operation) {
+
+
+
+
+
+
+
+
+
     case QHttpNetworkRequest::Options:
-        ba += "OPTIONS";
-        break;
-    case QHttpNetworkRequest::Get:
-        ba += "GET";
-        break;
-    case QHttpNetworkRequest::Head:
-        ba += "HEAD";
-        break;
-    case QHttpNetworkRequest::Post:
-        ba += "POST";
+        return "OPTIONS";
         break;
     case QHttpNetworkRequest::Put:
-        ba += "PUT";
+         "PUT";
         break;
     case QHttpNetworkRequest::Delete:
-        ba += "DELETE";
+         "DELETE";
         break;
     case QHttpNetworkRequest::Trace:
-        ba += "TRACE";
+         "TRACE";
         break;
     case QHttpNetworkRequest::Connect:
-        ba += "CONNECT";
+        return "CONNECT";
+        break;
+    case QHttpNetworkRequest::Custom:
+        return customVerb;
         break;
     default:
         break;
     }
-    return ba;
+    return ;
 }
 
@@ -129 +133 @@
 QByteArray QHttpNetworkRequestPrivate::header(const QHttpNetworkRequest &request, bool throughProxy)
 {
-    QByteArray ba = request.d->methodName();
-    QByteArray uri = request.d->uri(throughProxy);
-    ba += ' ' + uri;
-
-    QString majorVersion = QString::number(request.majorVersion());
-    QString minorVersion = QString::number(request.minorVersion());
-    ba += " HTTP/" + majorVersion.toLatin1() + '.' + minorVersion.toLatin1() + "\r\n";
-
     QList<QPair<QByteArray, QByteArray> > fields = request.header();
+
+
+
+
+
+
+
+
+
+
+
+
+
     QList<QPair<QByteArray, QByteArray> >::const_iterator it = fields.constBegin();
-    for (; it != fields.constEnd(); ++it)
-        ba += it->first + ": " + it->second + "\r\n";
+    QList<QPair<QByteArray, QByteArray> >::const_iterator endIt = fields.constEnd();
+    for (; it != endIt; ++it) {
+        ba += it->first;
+        ba += ": ";
+        ba += it->second;
+        ba += "\r\n";
+    }
     if (request.d->operation == QHttpNetworkRequest::Post) {
         // add content type, if not set in the request