[libsoup] Revert "Warn if the user tries to load a URI containing a fragment."
- From: Dan Winship <danw src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [libsoup] Revert "Warn if the user tries to load a URI containing a fragment."
- Date: Fri, 18 Dec 2009 18:42:18 +0000 (UTC)
commit 4bd5fca55ca2ee506afa6992ac5731ffd2158184
Author: Dan Winship <danw gnome org>
Date: Fri Dec 18 19:24:44 2009 +0100
Revert "Warn if the user tries to load a URI containing a fragment."
This is causing problems in WebKit.
This reverts commit 19cc4d0c0956ec92f06a0a3a746ad0434e47bc9c.
libsoup/soup-message.c | 19 +------------------
libsoup/soup-session.c | 7 -------
tests/redirect-test.c | 10 ----------
3 files changed, 1 insertions(+), 35 deletions(-)
---
diff --git a/libsoup/soup-message.c b/libsoup/soup-message.c
index 64aa42e..93c2522 100644
--- a/libsoup/soup-message.c
+++ b/libsoup/soup-message.c
@@ -659,11 +659,7 @@ get_property (GObject *object, guint prop_id,
* @method: the HTTP method for the created request
* @uri_string: the destination endpoint (as a string)
*
- * Creates a new empty #SoupMessage, which will connect to @uri.
- *
- * @uri should not include a fragment identifier (ie, a "#" followed
- * by an HTML anchor name, etc); fragments are not meaningful at the
- * HTTP level.
+ * Creates a new empty #SoupMessage, which will connect to @uri
*
* Return value: the new #SoupMessage (or %NULL if @uri could not
* be parsed).
@@ -697,9 +693,6 @@ soup_message_new (const char *method, const char *uri_string)
*
* Creates a new empty #SoupMessage, which will connect to @uri
*
- * @uri should not include a fragment identifier; fragments are not
- * meaningful at the HTTP level.
- *
* Return value: the new #SoupMessage
*/
SoupMessage *
@@ -1417,8 +1410,6 @@ soup_message_is_keepalive (SoupMessage *msg)
* Sets @msg's URI to @uri. If @msg has already been sent and you want
* to re-send it with the new URI, you need to call
* soup_session_requeue_message().
- *
- * @uri should not include a fragment identifier.
**/
void
soup_message_set_uri (SoupMessage *msg, SoupURI *uri)
@@ -1436,14 +1427,6 @@ soup_message_set_uri (SoupMessage *msg, SoupURI *uri)
}
priv->uri = soup_uri_copy (uri);
- if (priv->uri && priv->uri->fragment) {
- char *uristr = soup_uri_to_string (priv->uri, FALSE);
- g_warning ("soup_message_set_uri: stripping fragment identifier from URI '%s'",
- uristr);
- g_free (uristr);
- soup_uri_set_fragment (priv->uri, NULL);
- }
-
g_object_notify (G_OBJECT (msg), SOUP_MESSAGE_URI);
}
diff --git a/libsoup/soup-session.c b/libsoup/soup-session.c
index 2428cfe..c6d8765 100644
--- a/libsoup/soup-session.c
+++ b/libsoup/soup-session.c
@@ -1123,13 +1123,6 @@ redirect_handler (SoupMessage *msg, gpointer user_data)
return;
}
- /* URI fragments are also not allowed in Location, but again,
- * some sites do this. Strip it to keep soup_message_set_uri()
- * from warning about it. (If the application wants to obey
- * the fragment anyway it can reparse Location itself.)
- */
- soup_uri_set_fragment (new_uri, NULL);
-
soup_message_set_uri (msg, new_uri);
soup_uri_free (new_uri);
diff --git a/tests/redirect-test.c b/tests/redirect-test.c
index b99aabf..cd6f1a5 100644
--- a/tests/redirect-test.c
+++ b/tests/redirect-test.c
@@ -100,11 +100,6 @@ static struct {
{ { { "POST", "/307", 307 },
{ NULL } }, 307 },
- /* Test behavior with Location header containing URI fragment */
- { { { "GET", "/bad-with-fragment", 302 },
- { "GET", "/", 200 },
- { NULL } }, 200 },
-
/* Test behavior with recoverably-bad Location header */
{ { { "GET", "/bad", 302 },
{ "GET", "/bad%20with%20spaces", 200 },
@@ -244,11 +239,6 @@ server_callback (SoupServer *server, SoupMessage *msg,
soup_message_headers_replace (msg->response_headers,
"Location",
"about:blank");
- } else if (!strcmp (path, "/bad-with-fragment")) {
- soup_message_set_status (msg, SOUP_STATUS_FOUND);
- soup_message_headers_replace (msg->response_headers,
- "Location",
- "/#fragment");
} else if (!strcmp (path, "/bad with spaces"))
soup_message_set_status (msg, SOUP_STATUS_OK);
else
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]