From 4c6e549b250b834b43473aa3d748d625449df42c Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Tue, 20 Aug 2019 14:55:54 +0200 Subject: QHttp2Configuration: remove setters/getter for indexing Upon reading the Apple's documentation it would appear the indexing is more complicated (they name the specific fields and which kind of indexing must be applied to each). This requires a finer level of configuration/control and probably a separate class (aka QHpackConfiguration? ;). We'll provide it in future, if requested by our users. Fixes: QTBUG-77412 Change-Id: I6e9461b3966ed59c8b70873eab999a07a04eb289 Reviewed-by: Volker Hilsheimer --- src/network/access/qhttp2configuration.cpp | 37 +++--------------------------- src/network/access/qhttp2configuration.h | 3 --- 2 files changed, 3 insertions(+), 37 deletions(-) (limited to 'src/network/access') diff --git a/src/network/access/qhttp2configuration.cpp b/src/network/access/qhttp2configuration.cpp index 14c9d6dc29..a32bccfd09 100644 --- a/src/network/access/qhttp2configuration.cpp +++ b/src/network/access/qhttp2configuration.cpp @@ -79,13 +79,9 @@ QT_BEGIN_NAMESPACE frame. \endlist - The QHttp2Configuration class also controls some of the parameters - affecting the header compression algorithm (HPACK). They include: - - \list - \li Huffman string compression. - \li Indexing strings. - \endlist + The QHttp2Configuration class also controls if the header compression + algorithm (HPACK) is additionally using Huffman coding for string + compression. \note The configuration must be set before the first request was sent to a given host (and thus an HTTP/2 session established). @@ -112,7 +108,6 @@ public: bool pushEnabled = false; // TODO: for now those two below are noop. bool huffmanCompressionEnabled = true; - bool indexingEnabled = true; }; /*! @@ -122,7 +117,6 @@ public: \list \li Server push is disabled \li Huffman string compression is enabled - \li String indexing is enabled \li Window size for connection-level flow control is 65535 octets \li Window size for stream-level flow control is 65535 octets \li Frame size is 16384 octets @@ -211,30 +205,6 @@ bool QHttp2Configuration::huffmanCompressionEnabled() const return d->huffmanCompressionEnabled; } -/*! - If \a enable is \c true, HPACK compression will index strings - in its dynamic compression table. Enabled by default. - - \note This setting only has an affect on how QNetworkAccessManager - sending 'HEADERS' frames. - - \sa stringIndexingEnabled -*/ -void QHttp2Configuration::setStringIndexingEnabled(bool enable) -{ - d->indexingEnabled = enable; -} - -/*! - Returns \true if HPACK compression is indexing strings. - - \sa setStringIndexingEnabled -*/ -bool QHttp2Configuration::stringIndexingEnabled() const -{ - return d->indexingEnabled; -} - /*! Sets the window size for connection-level flow control. \a size cannot be 0 and must not exceed 2147483647 octets. @@ -335,7 +305,6 @@ bool operator==(const QHttp2Configuration &lhs, const QHttp2Configuration &rhs) return lhs.d->pushEnabled == rhs.d->pushEnabled && lhs.d->huffmanCompressionEnabled == rhs.d->huffmanCompressionEnabled - && lhs.d->indexingEnabled == rhs.d->indexingEnabled && lhs.d->sessionWindowSize == rhs.d->sessionWindowSize && lhs.d->streamWindowSize == rhs.d->streamWindowSize; } diff --git a/src/network/access/qhttp2configuration.h b/src/network/access/qhttp2configuration.h index 2a5e8c9341..544e3a3d98 100644 --- a/src/network/access/qhttp2configuration.h +++ b/src/network/access/qhttp2configuration.h @@ -66,9 +66,6 @@ public: void setHuffmanCompressionEnabled(bool enable); bool huffmanCompressionEnabled() const; - void setStringIndexingEnabled(bool enable); - bool stringIndexingEnabled() const; - bool setSessionReceiveWindowSize(unsigned size); unsigned sessionReceiveWindowSize() const; -- cgit v1.2.3