diff options
author | Dan Winship <danw@src.gnome.org> | 2008-09-24 12:19:51 +0000 |
---|---|---|
committer | Dan Winship <danw@src.gnome.org> | 2008-09-24 12:19:51 +0000 |
commit | c4d9bb17e8507d87be29067a893ccfcddba3ab69 (patch) | |
tree | ad5af4c9b265ac0b19963d564fa5ea2bcf9e2c00 | |
parent | 250f9ef2cdb8cffd8ad7de7f4e6cf9f2bfd55e2f (diff) | |
download | libsoup-c4d9bb17e8507d87be29067a893ccfcddba3ab69.tar.gz |
merge from trunk 2.24.0.1LIBSOUP_2_24_0_1
merge from trunk
* configure.in: 2.24.0.1
* NEWS: Update
* libsoup/soup-session.c (redirect_handler):
* libsoup/soup-message.c (soup_message_new):
(soup_message_new_from_uri, soup_message_set_uri): Revert the
2008-08-25 change; it breaks the rhythmbox DAAP plugin. #553466.
To be revisited.
svn path=/branches/gnome-2-24/; revision=1165
-rw-r--r-- | ChangeLog | 12 | ||||
-rw-r--r-- | NEWS | 5 | ||||
-rw-r--r-- | configure.in | 2 | ||||
-rw-r--r-- | libsoup/soup-message.c | 25 | ||||
-rw-r--r-- | libsoup/soup-session.c | 4 |
5 files changed, 29 insertions, 19 deletions
@@ -1,3 +1,15 @@ +2008-09-23 Dan Winship <danw@gnome.org> + + * configure.in: 2.24.0.1 + + * NEWS: Update + + * libsoup/soup-session.c (redirect_handler): + * libsoup/soup-message.c (soup_message_new): + (soup_message_new_from_uri, soup_message_set_uri): Revert the + 2008-08-25 change; it breaks the rhythmbox DAAP plugin. #553466. + To be revisited. + 2008-09-22 Dan Winship <danw@gnome.org> * configure.in: 2.24.0 @@ -1,3 +1,8 @@ +Changes in libsoup from 2.23.92 to 2.24.0.1: + + * Reverted part of the fix for #528882, which caused the DAAP + plugin in rhythmbox to crash. [#553466] + Changes in libsoup from 2.23.91 to 2.23.92: * Fixed the handling of a 302 response to a HEAD request, diff --git a/configure.in b/configure.in index f84d55c0..bd0473f4 100644 --- a/configure.in +++ b/configure.in @@ -3,7 +3,7 @@ dnl *** Initialize automake and set version *** dnl ******************************************* AC_PREREQ(2.53) -AC_INIT(libsoup, 2.24.0) +AC_INIT(libsoup, 2.24.0.1) AC_CONFIG_SRCDIR(libsoup.pc.in) AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) diff --git a/libsoup/soup-message.c b/libsoup/soup-message.c index 4c6aebbf..c5890cef 100644 --- a/libsoup/soup-message.c +++ b/libsoup/soup-message.c @@ -554,7 +554,7 @@ get_property (GObject *object, guint prop_id, * Creates a new empty #SoupMessage, which will connect to @uri * * Return value: the new #SoupMessage (or %NULL if @uri could not - * be parsed or is not a valid HTTP/HTTPS URI). + * be parsed). */ SoupMessage * soup_message_new (const char *method, const char *uri_string) @@ -568,6 +568,10 @@ soup_message_new (const char *method, const char *uri_string) uri = soup_uri_new (uri_string); if (!uri) return NULL; + if (!uri->host) { + soup_uri_free (uri); + return NULL; + } msg = soup_message_new_from_uri (method, uri); soup_uri_free (uri); @@ -579,20 +583,13 @@ soup_message_new (const char *method, const char *uri_string) * @method: the HTTP method for the created request * @uri: the destination endpoint (as a #SoupURI) * - * Creates a new empty #SoupMessage, which will connect to @uri. + * Creates a new empty #SoupMessage, which will connect to @uri * - * Return value: the new #SoupMessage (or %NULL if @uri is not a - * valid HTTP/HTTPS URI) + * Return value: the new #SoupMessage */ SoupMessage * soup_message_new_from_uri (const char *method, SoupURI *uri) { - g_return_val_if_fail (method != NULL, NULL); - g_return_val_if_fail (uri != NULL, NULL); - - if (!SOUP_URI_VALID_FOR_HTTP (uri)) - return NULL; - return g_object_new (SOUP_TYPE_MESSAGE, SOUP_MESSAGE_METHOD, method, SOUP_MESSAGE_URI, uri, @@ -1269,9 +1266,8 @@ soup_message_is_keepalive (SoupMessage *msg) * @msg: a #SoupMessage * @uri: the new #SoupURI * - * Sets @msg's URI to @uri, which must be a valid HTTP/HTTPS URI (per - * SOUP_URI_VALID_FOR_HTTP()). If @msg has already been sent and you - * want to re-send it with the new URI, you need to call + * 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(). **/ void @@ -1280,9 +1276,8 @@ soup_message_set_uri (SoupMessage *msg, SoupURI *uri) SoupMessagePrivate *priv; g_return_if_fail (SOUP_IS_MESSAGE (msg)); - g_return_if_fail (SOUP_URI_VALID_FOR_HTTP (uri)); - priv = SOUP_MESSAGE_GET_PRIVATE (msg); + if (priv->uri) soup_uri_free (priv->uri); priv->uri = soup_uri_copy (uri); diff --git a/libsoup/soup-session.c b/libsoup/soup-session.c index 3d802057..9f23e895 100644 --- a/libsoup/soup-session.c +++ b/libsoup/soup-session.c @@ -819,9 +819,7 @@ redirect_handler (SoupMessage *msg, gpointer user_data) * are lame, so we use soup_uri_new_with_base(). */ new_uri = soup_uri_new_with_base (soup_message_get_uri (msg), new_loc); - if (!SOUP_URI_VALID_FOR_HTTP (new_uri)) { - if (new_uri) - soup_uri_free (new_uri); + if (!new_uri) { soup_message_set_status_full (msg, SOUP_STATUS_MALFORMED, "Invalid Redirect URL"); |