libsoup r1165 - in branches/gnome-2-24: . libsoup

[danw svn gnome org]

Author: danw
Date: Wed Sep 24 12:19:51 2008
New Revision: 1165
URL: http://svn.gnome.org/viewvc/libsoup?rev=1165&view=rev

Log:
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.


Modified:
   branches/gnome-2-24/ChangeLog
   branches/gnome-2-24/NEWS
   branches/gnome-2-24/configure.in
   branches/gnome-2-24/libsoup/soup-message.c
   branches/gnome-2-24/libsoup/soup-session.c

Modified: branches/gnome-2-24/NEWS
==============================================================================
--- branches/gnome-2-24/NEWS	(original)
+++ branches/gnome-2-24/NEWS	Wed Sep 24 12:19:51 2008
@@ -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,

Modified: branches/gnome-2-24/configure.in
==============================================================================
--- branches/gnome-2-24/configure.in	(original)
+++ branches/gnome-2-24/configure.in	Wed Sep 24 12:19:51 2008
@@ -3,7 +3,7 @@
 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)
 

Modified: branches/gnome-2-24/libsoup/soup-message.c
==============================================================================
--- branches/gnome-2-24/libsoup/soup-message.c	(original)
+++ branches/gnome-2-24/libsoup/soup-message.c	Wed Sep 24 12:19:51 2008
@@ -554,7 +554,7 @@
  * 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 @@
 	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 @@
  * @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 @@
  * @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 @@
 	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);

Modified: branches/gnome-2-24/libsoup/soup-session.c
==============================================================================
--- branches/gnome-2-24/libsoup/soup-session.c	(original)
+++ branches/gnome-2-24/libsoup/soup-session.c	Wed Sep 24 12:19:51 2008
@@ -819,9 +819,7 @@
 	 * 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");