[libsoup/carlosgc/simple-api] Remove SoupRequest API
- From: Carlos Garcia Campos <carlosgc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libsoup/carlosgc/simple-api] Remove SoupRequest API
- Date: Mon, 19 Oct 2020 12:24:57 +0000 (UTC)
commit d32453cd746839a4acaa00b7ac9eeffe45813d99
Author: Carlos Garcia Campos <cgarcia igalia com>
Date: Mon Oct 19 13:26:15 2020 +0200
Remove SoupRequest API
docs/reference/libsoup-3.0-docs.xml | 9 -
docs/reference/libsoup-3.0-sections.txt | 86 -------
docs/reference/meson.build | 1 -
docs/reference/request-howto.xml | 180 --------------
libsoup/meson.build | 8 -
libsoup/soup-message-io.c | 8 +-
libsoup/soup-message-private.h | 3 -
libsoup/soup-message.c | 38 +--
libsoup/soup-message.h | 3 -
libsoup/soup-request-data.c | 169 -------------
libsoup/soup-request-data.h | 32 ---
libsoup/soup-request-file.c | 394 -------------------------------
libsoup/soup-request-file.h | 35 ---
libsoup/soup-request-http.c | 243 -------------------
libsoup/soup-request-http.h | 35 ---
libsoup/soup-request.c | 404 --------------------------------
libsoup/soup-request.h | 85 -------
libsoup/soup-session.c | 255 +-------------------
libsoup/soup-session.h | 30 ---
libsoup/soup.h | 4 -
tests/meson.build | 1 -
tests/resource-test.c | 221 -----------------
tests/session-test.c | 9 -
23 files changed, 11 insertions(+), 2242 deletions(-)
---
diff --git a/docs/reference/libsoup-3.0-docs.xml b/docs/reference/libsoup-3.0-docs.xml
index adb0d12c..8f1ed18d 100644
--- a/docs/reference/libsoup-3.0-docs.xml
+++ b/docs/reference/libsoup-3.0-docs.xml
@@ -14,18 +14,9 @@
<title>Tutorial</title>
<xi:include href="build-howto.xml"/>
<xi:include href="client-howto.xml"/>
- <xi:include href="request-howto.xml"/>
<xi:include href="server-howto.xml"/>
</chapter>
- <chapter>
- <title>Request API</title>
- <xi:include href="xml/soup-request.xml"/>
- <xi:include href="xml/soup-request-http.xml"/>
- <xi:include href="xml/soup-request-file.xml"/>
- <xi:include href="xml/soup-request-data.xml"/>
- </chapter>
-
<chapter>
<title>Core HTTP API</title>
<xi:include href="xml/soup-cookie.xml"/>
diff --git a/docs/reference/libsoup-3.0-sections.txt b/docs/reference/libsoup-3.0-sections.txt
index aa89d8c0..0032e4f3 100644
--- a/docs/reference/libsoup-3.0-sections.txt
+++ b/docs/reference/libsoup-3.0-sections.txt
@@ -32,7 +32,6 @@ soup_message_get_flags
<SUBSECTION>
soup_message_disable_feature
soup_message_is_feature_disabled
-soup_message_get_soup_request
<SUBSECTION>
SoupMessagePriority
soup_message_get_priority
@@ -402,13 +401,6 @@ SoupSessionError
soup_session_new
soup_session_new_with_options
<SUBSECTION>
-soup_session_request
-soup_session_request_uri
-soup_session_request_http
-soup_session_request_http_uri
-SoupRequestError
-SOUP_REQUEST_ERROR
-<SUBSECTION>
soup_session_cancel_message
<SUBSECTION>
soup_session_send
@@ -470,7 +462,6 @@ SOUP_TYPE_SESSION
SOUP_SESSION_ERROR
SoupSessionClass
soup_session_get_type
-soup_request_error_quark
soup_session_error_quark
<SUBSECTION Private>
SoupSocket
@@ -909,83 +900,6 @@ SoupContentDecoderPrivate
soup_content_decoder_get_type
</SECTION>
-<SECTION>
-<FILE>soup-request</FILE>
-<TITLE>SoupRequest</TITLE>
-SoupRequest
-soup_request_send
-soup_request_send_async
-soup_request_send_finish
-<SUBSECTION>
-soup_request_get_content_length
-soup_request_get_content_type
-soup_request_get_session
-soup_request_get_uri
-<SUBSECTION>
-SOUP_REQUEST_SESSION
-SOUP_REQUEST_URI
-<SUBSECTION Standard>
-SOUP_IS_REQUEST
-SOUP_IS_REQUEST_CLASS
-SOUP_REQUEST
-SOUP_REQUEST_CLASS
-SOUP_REQUEST_GET_CLASS
-SOUP_TYPE_REQUEST
-SoupRequestClass
-SoupRequestPrivate
-soup_request_get_type
-</SECTION>
-
-<SECTION>
-<FILE>soup-request-data</FILE>
-<TITLE>SoupRequestData</TITLE>
-SoupRequestData
-<SUBSECTION Standard>
-SOUP_IS_REQUEST_DATA
-SOUP_IS_REQUEST_DATA_CLASS
-SOUP_REQUEST_DATA
-SOUP_REQUEST_DATA_CLASS
-SOUP_REQUEST_DATA_GET_CLASS
-SOUP_TYPE_REQUEST_DATA
-SoupRequestDataClass
-SoupRequestDataPrivate
-soup_request_data_get_type
-</SECTION>
-
-<SECTION>
-<FILE>soup-request-file</FILE>
-<TITLE>SoupRequestFile</TITLE>
-SoupRequestFile
-soup_request_file_get_file
-<SUBSECTION Standard>
-SOUP_IS_REQUEST_FILE
-SOUP_IS_REQUEST_FILE_CLASS
-SOUP_REQUEST_FILE
-SOUP_REQUEST_FILE_CLASS
-SOUP_REQUEST_FILE_GET_CLASS
-SOUP_TYPE_REQUEST_FILE
-SoupRequestFileClass
-SoupRequestFilePrivate
-soup_request_file_get_type
-</SECTION>
-
-<SECTION>
-<FILE>soup-request-http</FILE>
-<TITLE>SoupRequestHTTP</TITLE>
-SoupRequestHTTP
-soup_request_http_get_message
-<SUBSECTION Standard>
-SOUP_IS_REQUEST_HTTP
-SOUP_IS_REQUEST_HTTP_CLASS
-SOUP_REQUEST_HTTP
-SOUP_REQUEST_HTTP_CLASS
-SOUP_REQUEST_HTTP_GET_CLASS
-SOUP_TYPE_REQUEST_HTTP
-SoupRequestHTTPClass
-SoupRequestHTTPPrivate
-soup_request_http_get_type
-</SECTION>
-
<SECTION>
<FILE>soup-tld</FILE>
<TITLE>SoupTLD</TITLE>
diff --git a/docs/reference/meson.build b/docs/reference/meson.build
index 3141b9ac..d5f499ec 100644
--- a/docs/reference/meson.build
+++ b/docs/reference/meson.build
@@ -64,7 +64,6 @@ gnome.gtkdoc('libsoup-3.0',
content_files: [
'build-howto.xml',
'client-howto.xml',
- 'request-howto.xml',
'server-howto.xml'
]
)
diff --git a/libsoup/meson.build b/libsoup/meson.build
index 3a700870..e8bf6f43 100644
--- a/libsoup/meson.build
+++ b/libsoup/meson.build
@@ -74,10 +74,6 @@ soup_sources = [
'soup-misc.c',
'soup-multipart.c',
'soup-multipart-input-stream.c',
- 'soup-request.c',
- 'soup-request-data.c',
- 'soup-request-file.c',
- 'soup-request-http.c',
'soup-session.c',
'soup-session-feature.c',
'soup-socket.c',
@@ -137,10 +133,6 @@ soup_introspection_headers = [
'soup-method.h',
'soup-multipart.h',
'soup-multipart-input-stream.h',
- 'soup-request.h',
- 'soup-request-data.h',
- 'soup-request-file.h',
- 'soup-request-http.h',
'soup-session.h',
'soup-session-feature.h',
'soup-status.h',
diff --git a/libsoup/soup-message-io.c b/libsoup/soup-message-io.c
index feb88672..9387aafd 100644
--- a/libsoup/soup-message-io.c
+++ b/libsoup/soup-message-io.c
@@ -483,8 +483,8 @@ parse_headers (SoupMessage *msg,
&version,
&msg->status_code,
&msg->reason_phrase)) {
- g_set_error_literal (error, SOUP_REQUEST_ERROR,
- SOUP_REQUEST_ERROR_PARSING,
+ g_set_error_literal (error, SOUP_SESSION_ERROR,
+ SOUP_SESSION_ERROR_PARSING,
_("Could not parse HTTP response"));
return SOUP_STATUS_MALFORMED;
}
@@ -506,8 +506,8 @@ parse_headers (SoupMessage *msg,
*encoding = soup_message_headers_get_encoding (msg->response_headers);
if (*encoding == SOUP_ENCODING_UNRECOGNIZED) {
- g_set_error_literal (error, SOUP_REQUEST_ERROR,
- SOUP_REQUEST_ERROR_ENCODING,
+ g_set_error_literal (error, SOUP_SESSION_ERROR,
+ SOUP_SESSION_ERROR_ENCODING,
_("Unrecognized HTTP response encoding"));
return SOUP_STATUS_MALFORMED;
}
diff --git a/libsoup/soup-message-private.h b/libsoup/soup-message-private.h
index 21b3a07f..98e862a5 100644
--- a/libsoup/soup-message-private.h
+++ b/libsoup/soup-message-private.h
@@ -134,9 +134,6 @@ GInputStream *soup_message_setup_body_istream (GInputStream *body_stream,
SoupSession *session,
SoupProcessingStage start_at_stage);
-void soup_message_set_soup_request (SoupMessage *msg,
- SoupRequest *req);
-
SoupConnection *soup_message_get_connection (SoupMessage *msg);
void soup_message_set_connection (SoupMessage *msg,
SoupConnection *conn);
diff --git a/libsoup/soup-message.c b/libsoup/soup-message.c
index 0a265dea..3b327413 100644
--- a/libsoup/soup-message.c
+++ b/libsoup/soup-message.c
@@ -26,12 +26,7 @@
*
* You would create a #SoupMessage with soup_message_new() or
* soup_message_new_from_uri(), set up its
- * fields appropriately, and send it. If you are using the newer
- * #SoupRequest API, you would create a request with
- * soup_session_request_http() or soup_session_request_http_uri(), and
- * the returned #SoupRequestHTTP will already have an associated
- * #SoupMessage that you can retrieve via
- * soup_request_http_get_message().
+ * fields appropriately, and send it.
*
* Note that libsoup's terminology here does not quite match the HTTP
* specification: in RFC 2616, an "HTTP-message" is
@@ -1745,37 +1740,6 @@ soup_message_get_https_status (SoupMessage *msg,
return priv->tls_certificate != NULL;
}
-void
-soup_message_set_soup_request (SoupMessage *msg,
- SoupRequest *req)
-{
- SoupMessagePrivate *priv = soup_message_get_instance_private (msg);
-
- priv->request = req;
-}
-
-/**
- * soup_message_get_soup_request:
- * @msg: a #SoupMessage
- *
- * If @msg is associated with a #SoupRequest, this returns that
- * request. Otherwise it returns %NULL.
- *
- * Return value: (transfer none): @msg's associated #SoupRequest
- *
- * Since: 2.42
- */
-SoupRequest *
-soup_message_get_soup_request (SoupMessage *msg)
-{
- SoupMessagePrivate *priv;
-
- g_return_val_if_fail (SOUP_IS_MESSAGE (msg), NULL);
-
- priv = soup_message_get_instance_private (msg);
- return priv->request;
-}
-
/**
* SoupMessagePriority:
* @SOUP_MESSAGE_PRIORITY_VERY_LOW: The lowest priority, the messages
diff --git a/libsoup/soup-message.h b/libsoup/soup-message.h
index 01664ab6..e30e9049 100644
--- a/libsoup/soup-message.h
+++ b/libsoup/soup-message.h
@@ -182,9 +182,6 @@ SOUP_AVAILABLE_IN_2_72
gboolean soup_message_is_feature_disabled (SoupMessage *msg,
GType feature_type);
-SOUP_AVAILABLE_IN_2_42
-SoupRequest *soup_message_get_soup_request (SoupMessage *msg);
-
typedef enum {
SOUP_MESSAGE_PRIORITY_VERY_LOW = 0,
diff --git a/libsoup/soup-session.c b/libsoup/soup-session.c
index d3c82811..57e74e2e 100644
--- a/libsoup/soup-session.c
+++ b/libsoup/soup-session.c
@@ -56,15 +56,12 @@
* logging HTTP traffic, #SoupContentDecoder provides support for
* compressed response handling, and #SoupContentSniffer provides
* support for HTML5-style response body content sniffing.
- * Additionally, subtypes of #SoupAuth and #SoupRequest can be added
- * as features, to add support for additional authentication and URI
- * types.
+ * Additionally, subtypes of #SoupAuth can be added
+ * as features, to add support for additional authentication types.
*
* All #SoupSessions are created with a #SoupAuthManager, and support
- * for %SOUP_TYPE_AUTH_BASIC and %SOUP_TYPE_AUTH_DIGEST. For
- * #SoupRequest types, #SoupRequestHTTP, #SoupRequestFile, and
- * #SoupRequestData are supported. Additionally, sessions using the
- * plain #SoupSession class (rather than one of its deprecated
+ * for %SOUP_TYPE_AUTH_BASIC and %SOUP_TYPE_AUTH_DIGEST. Additionally,
+ * sessions using the plain #SoupSession class (rather than one of its deprecated
* subtypes) have a #SoupContentDecoder by default.
**/
@@ -133,8 +130,6 @@ typedef struct {
GMainContext *async_context;
char **http_aliases, **https_aliases;
-
- GHashTable *request_types;
} SoupSessionPrivate;
#define SOUP_IS_PLAIN_SESSION(o) (G_TYPE_FROM_INSTANCE (o) == SOUP_TYPE_SESSION)
@@ -288,12 +283,6 @@ soup_session_init (SoupSession *session)
*/
priv->proxy_use_default = TRUE;
priv->tlsdb_use_default = TRUE;
-
- priv->request_types = g_hash_table_new (soup_str_case_hash,
- soup_str_case_equal);
- soup_session_add_feature_by_type (session, SOUP_TYPE_REQUEST_HTTP);
- soup_session_add_feature_by_type (session, SOUP_TYPE_REQUEST_FILE);
- soup_session_add_feature_by_type (session, SOUP_TYPE_REQUEST_DATA);
}
static void
@@ -344,8 +333,6 @@ soup_session_finalize (GObject *object)
g_free (priv->http_aliases);
g_free (priv->https_aliases);
- g_hash_table_destroy (priv->request_types);
-
g_clear_pointer (&priv->socket_props, soup_socket_properties_unref);
G_OBJECT_CLASS (soup_session_parent_class)->finalize (object);
@@ -2179,8 +2166,7 @@ soup_session_add_feature (SoupSession *session, SoupSessionFeature *feature)
*
* If @feature_type is not a #SoupSessionFeature type, this gives each
* existing feature on @session the chance to accept @feature_type as
- * a "subfeature". This can be used to add new #SoupAuth or
- * #SoupRequest types, for instance.
+ * a "subfeature". This can be used to add new #SoupAuth types, for instance.
*
* You can also add a feature to the session at construct time by
* using the %SOUP_SESSION_ADD_FEATURE_BY_TYPE property.
@@ -2205,16 +2191,6 @@ soup_session_add_feature_by_type (SoupSession *session, GType feature_type)
feature = g_object_new (feature_type, NULL);
soup_session_add_feature (session, feature);
g_object_unref (feature);
- } else if (g_type_is_a (feature_type, SOUP_TYPE_REQUEST)) {
- SoupRequestClass *request_class;
- int i;
-
- request_class = g_type_class_ref (feature_type);
- for (i = 0; request_class->schemes[i]; i++) {
- g_hash_table_insert (priv->request_types,
- (char *)request_class->schemes[i],
- GSIZE_TO_POINTER (feature_type));
- }
} else {
GSList *f;
@@ -2281,17 +2257,6 @@ soup_session_remove_feature_by_type (SoupSession *session, GType feature_type)
goto restart;
}
}
- } else if (g_type_is_a (feature_type, SOUP_TYPE_REQUEST)) {
- SoupRequestClass *request_class;
- int i;
-
- request_class = g_type_class_peek (feature_type);
- if (!request_class)
- return;
- for (i = 0; request_class->schemes[i]; i++) {
- g_hash_table_remove (priv->request_types,
- request_class->schemes[i]);
- }
} else {
for (f = priv->features; f; f = f->next) {
if (soup_session_feature_remove_feature (f->data, feature_type))
@@ -2308,8 +2273,7 @@ soup_session_remove_feature_by_type (SoupSession *session, GType feature_type)
*
* Tests if @session has at a feature of type @feature_type (which can
* be the type of either a #SoupSessionFeature, or else a subtype of
- * some class managed by another feature, such as #SoupAuth or
- * #SoupRequest).
+ * some class managed by another feature, such as #SoupAuth).
*
* Return value: %TRUE or %FALSE
*
@@ -2331,22 +2295,6 @@ soup_session_has_feature (SoupSession *session,
if (G_TYPE_CHECK_INSTANCE_TYPE (f->data, feature_type))
return TRUE;
}
- } else if (g_type_is_a (feature_type, SOUP_TYPE_REQUEST)) {
- SoupRequestClass *request_class;
- int i;
-
- request_class = g_type_class_peek (feature_type);
- if (!request_class)
- return FALSE;
-
- for (i = 0; request_class->schemes[i]; i++) {
- gpointer type;
-
- type = g_hash_table_lookup (priv->request_types,
- request_class->schemes[i]);
- if (type && g_type_is_a (GPOINTER_TO_SIZE (type), feature_type))
- return TRUE;
- }
} else {
for (f = priv->features; f; f = f->next) {
if (soup_session_feature_has_feature (f->data, feature_type))
@@ -4690,197 +4638,6 @@ soup_session_get_bytes (SoupSession *session,
return bytes;
}
-/**
- * soup_session_request:
- * @session: a #SoupSession
- * @uri_string: a URI, in string form
- * @error: return location for a #GError, or %NULL
- *
- * Creates a #SoupRequest for retrieving @uri_string.
- *
- * Return value: (transfer full): a new #SoupRequest, or
- * %NULL on error.
- *
- * Since: 2.42
- */
-SoupRequest *
-soup_session_request (SoupSession *session, const char *uri_string,
- GError **error)
-{
- SoupURI *uri;
- SoupRequest *req;
-
- uri = soup_uri_new (uri_string);
- if (!uri) {
- g_set_error (error, SOUP_REQUEST_ERROR,
- SOUP_REQUEST_ERROR_BAD_URI,
- _("Could not parse URI “%s”"), uri_string);
- return NULL;
- }
-
- req = soup_session_request_uri (session, uri, error);
- soup_uri_free (uri);
- return req;
-}
-
-/**
- * soup_session_request_uri:
- * @session: a #SoupSession
- * @uri: a #SoupURI representing the URI to retrieve
- * @error: return location for a #GError, or %NULL
- *
- * Creates a #SoupRequest for retrieving @uri.
- *
- * Return value: (transfer full): a new #SoupRequest, or
- * %NULL on error.
- *
- * Since: 2.42
- */
-SoupRequest *
-soup_session_request_uri (SoupSession *session, SoupURI *uri,
- GError **error)
-{
- SoupSessionPrivate *priv;
- GType request_type;
-
- g_return_val_if_fail (SOUP_IS_SESSION (session), NULL);
-
- priv = soup_session_get_instance_private (session);
-
- request_type = (GType)GPOINTER_TO_SIZE (g_hash_table_lookup (priv->request_types, uri->scheme));
- if (!request_type) {
- g_set_error (error, SOUP_REQUEST_ERROR,
- SOUP_REQUEST_ERROR_UNSUPPORTED_URI_SCHEME,
- _("Unsupported URI scheme “%s”"), uri->scheme);
- return NULL;
- }
-
- return g_initable_new (request_type, NULL, error,
- "uri", uri,
- "session", session,
- NULL);
-}
-
-static SoupRequestHTTP *
-initialize_http_request (SoupRequest *req,
- const char *method,
- GError **error)
-{
- SoupRequestHTTP *http;
- SoupMessage *msg;
-
- if (!SOUP_IS_REQUEST_HTTP (req)) {
- g_object_unref (req);
- g_set_error (error, SOUP_REQUEST_ERROR,
- SOUP_REQUEST_ERROR_BAD_URI,
- _("Not an HTTP URI"));
- return NULL;
- }
-
- http = SOUP_REQUEST_HTTP (req);
- msg = soup_request_http_get_message (http);
- g_object_set (G_OBJECT (msg),
- SOUP_MESSAGE_METHOD, method,
- NULL);
- g_object_unref (msg);
-
- return http;
-}
-
-/**
- * soup_session_request_http:
- * @session: a #SoupSession
- * @method: an HTTP method
- * @uri_string: a URI, in string form
- * @error: return location for a #GError, or %NULL
- *
- * Creates a #SoupRequest for retrieving @uri_string, which must be an
- * "http" or "https" URI (or another protocol listed in @session's
- * #SoupSession:http-aliases or #SoupSession:https-aliases).
- *
- * Return value: (transfer full): a new #SoupRequestHTTP, or
- * %NULL on error.
- *
- * Since: 2.42
- */
-SoupRequestHTTP *
-soup_session_request_http (SoupSession *session,
- const char *method,
- const char *uri_string,
- GError **error)
-{
- SoupRequest *req;
-
- req = soup_session_request (session, uri_string, error);
- if (!req)
- return NULL;
-
- return initialize_http_request (req, method, error);
-}
-
-/**
- * soup_session_request_http_uri:
- * @session: a #SoupSession
- * @method: an HTTP method
- * @uri: a #SoupURI representing the URI to retrieve
- * @error: return location for a #GError, or %NULL
- *
- * Creates a #SoupRequest for retrieving @uri, which must be an
- * "http" or "https" URI (or another protocol listed in @session's
- * #SoupSession:http-aliases or #SoupSession:https-aliases).
- *
- * Return value: (transfer full): a new #SoupRequestHTTP, or
- * %NULL on error.
- *
- * Since: 2.42
- */
-SoupRequestHTTP *
-soup_session_request_http_uri (SoupSession *session,
- const char *method,
- SoupURI *uri,
- GError **error)
-{
- SoupRequest *req;
-
- req = soup_session_request_uri (session, uri, error);
- if (!req)
- return NULL;
-
- return initialize_http_request (req, method, error);
-}
-
-/**
- * SOUP_REQUEST_ERROR:
- *
- * A #GError domain for #SoupRequest<!-- -->-related errors. Used with
- * #SoupRequestError.
- *
- * Since: 2.42
- */
-/**
- * SoupRequestError:
- * @SOUP_REQUEST_ERROR_BAD_URI: the URI could not be parsed
- * @SOUP_REQUEST_ERROR_UNSUPPORTED_URI_SCHEME: the URI scheme is not
- * supported by this #SoupSession
- * @SOUP_REQUEST_ERROR_PARSING: the server's response could not
- * be parsed
- * @SOUP_REQUEST_ERROR_ENCODING: the server's response was in an
- * unsupported format
- *
- * A #SoupRequest error.
- *
- * Since: 2.42
- */
-
-GQuark
-soup_request_error_quark (void)
-{
- static GQuark error;
- if (!error)
- error = g_quark_from_static_string ("soup_request_error_quark");
- return error;
-}
-
static GIOStream *
steal_connection (SoupSession *session,
SoupMessageQueueItem *item)
diff --git a/libsoup/soup-session.h b/libsoup/soup-session.h
index 9a5a5521..09597f24 100644
--- a/libsoup/soup-session.h
+++ b/libsoup/soup-session.h
@@ -160,36 +160,6 @@ GBytes *soup_session_get_bytes_finish (SoupSession *ses
char **content_type,
GError **error);
-SOUP_AVAILABLE_IN_2_42
-SoupRequest *soup_session_request (SoupSession *session,
- const char *uri_string,
- GError **error);
-SOUP_AVAILABLE_IN_2_42
-SoupRequest *soup_session_request_uri (SoupSession *session,
- SoupURI *uri,
- GError **error);
-SOUP_AVAILABLE_IN_2_42
-SoupRequestHTTP *soup_session_request_http (SoupSession *session,
- const char *method,
- const char *uri_string,
- GError **error);
-SOUP_AVAILABLE_IN_2_42
-SoupRequestHTTP *soup_session_request_http_uri (SoupSession *session,
- const char *method,
- SoupURI *uri,
- GError **error);
-
-SOUP_AVAILABLE_IN_2_42
-GQuark soup_request_error_quark (void);
-#define SOUP_REQUEST_ERROR soup_request_error_quark ()
-
-typedef enum {
- SOUP_REQUEST_ERROR_BAD_URI,
- SOUP_REQUEST_ERROR_UNSUPPORTED_URI_SCHEME,
- SOUP_REQUEST_ERROR_PARSING,
- SOUP_REQUEST_ERROR_ENCODING
-} SoupRequestError;
-
SOUP_AVAILABLE_IN_2_50
void soup_session_websocket_connect_async (SoupSession *session,
SoupMessage *msg,
diff --git a/libsoup/soup.h b/libsoup/soup.h
index bd95488e..c2b6c60b 100644
--- a/libsoup/soup.h
+++ b/libsoup/soup.h
@@ -37,10 +37,6 @@ extern "C" {
#include "soup-method.h"
#include "soup-multipart.h"
#include "soup-multipart-input-stream.h"
-#include "soup-request.h"
-#include "soup-request-data.h"
-#include "soup-request-file.h"
-#include "soup-request-http.h"
#include "server/soup-auth-domain.h"
#include "server/soup-auth-domain-basic.h"
#include "server/soup-auth-domain-digest.h"
diff --git a/tests/meson.build b/tests/meson.build
index b01397cd..1adeb167 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -51,7 +51,6 @@ tests = [
['ntlm', true, []],
['redirect', true, []],
['request-body', true, []],
- ['resource', true, []],
['samesite', true, []],
['session', true, []],
['server-auth', true, []],
diff --git a/tests/session-test.c b/tests/session-test.c
index 1417c62e..fac0d5b9 100644
--- a/tests/session-test.c
+++ b/tests/session-test.c
@@ -364,15 +364,6 @@ do_features_test (void)
g_assert_null (soup_session_get_feature (session, SOUP_TYPE_AUTH_MANAGER));
g_slist_free (features);
- /* HTTP, File and Data requests are always added */
- g_assert_true (soup_session_has_feature (session, SOUP_TYPE_REQUEST_HTTP));
- g_assert_true (soup_session_has_feature (session, SOUP_TYPE_REQUEST_FILE));
- g_assert_true (soup_session_has_feature (session, SOUP_TYPE_REQUEST_DATA));
- soup_session_remove_feature_by_type (session, SOUP_TYPE_REQUEST_FILE);
- g_assert_false (soup_session_has_feature (session, SOUP_TYPE_REQUEST_FILE));
- g_assert_true (soup_session_has_feature (session, SOUP_TYPE_REQUEST_HTTP));
- g_assert_true (soup_session_has_feature (session, SOUP_TYPE_REQUEST_DATA));
-
soup_test_session_abort_unref (session);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
