diff -Nru libsoup2.4-2.30.1/configure libsoup2.4-2.30.2/configure --- libsoup2.4-2.30.1/configure 2010-04-26 21:54:50.000000000 +0100 +++ libsoup2.4-2.30.2/configure 2010-06-22 18:07:34.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for libsoup 2.30.1. +# Generated by GNU Autoconf 2.65 for libsoup 2.30.2. # # Report bugs to . # @@ -702,8 +702,8 @@ # Identity of this package. PACKAGE_NAME='libsoup' PACKAGE_TARNAME='libsoup' -PACKAGE_VERSION='2.30.1' -PACKAGE_STRING='libsoup 2.30.1' +PACKAGE_VERSION='2.30.2' +PACKAGE_STRING='libsoup 2.30.2' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=libsoup' PACKAGE_URL='' @@ -1510,7 +1510,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libsoup 2.30.1 to adapt to many kinds of systems. +\`configure' configures libsoup 2.30.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1580,7 +1580,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libsoup 2.30.1:";; + short | recursive ) echo "Configuration of libsoup 2.30.2:";; esac cat <<\_ACEOF @@ -1717,7 +1717,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libsoup configure 2.30.1 +libsoup configure 2.30.2 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -1995,7 +1995,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libsoup $as_me 2.30.1, which was +It was created by libsoup $as_me 2.30.2, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2806,7 +2806,7 @@ # Define the identity of the package. PACKAGE='libsoup' - VERSION='2.30.1' + VERSION='2.30.2' cat >>confdefs.h <<_ACEOF @@ -13117,7 +13117,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libsoup $as_me 2.30.1, which was +This file was extended by libsoup $as_me 2.30.2, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13183,7 +13183,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libsoup config.status 2.30.1 +libsoup config.status 2.30.2 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff -Nru libsoup2.4-2.30.1/configure.ac libsoup2.4-2.30.2/configure.ac --- libsoup2.4-2.30.1/configure.ac 2010-04-26 21:18:29.000000000 +0100 +++ libsoup2.4-2.30.2/configure.ac 2010-06-22 18:07:17.000000000 +0100 @@ -3,7 +3,7 @@ dnl ******************************************* AC_PREREQ(2.63) -AC_INIT([libsoup],[2.30.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=libsoup]) +AC_INIT([libsoup],[2.30.2],[http://bugzilla.gnome.org/enter_bug.cgi?product=libsoup]) AC_CONFIG_SRCDIR([libsoup-2.4.pc.in]) AC_CONFIG_MACRO_DIR([m4]) diff -Nru libsoup2.4-2.30.1/debian/changelog libsoup2.4-2.30.2/debian/changelog --- libsoup2.4-2.30.1/debian/changelog 2010-05-18 18:02:24.000000000 +0100 +++ libsoup2.4-2.30.2/debian/changelog 2010-07-03 13:10:34.000000000 +0100 @@ -1,4 +1,14 @@ -libsoup2.4 (2.30.1-1~kkwkt1) karmic; urgency=low +libsoup2.4 (2.30.2-1~kkwkt1) karmic; urgency=low + + [Josselin Mouette] + * New upstream release. + * 01_disable_tls1.2.patch: stolen from git master. Disable TLS 1.2 and + use SSL 3.0 instead. Closes: #576339. + * libsoup2.4-1.symbols: updated for the new version. + + -- Stéphane Marguet Sat, 03 Jul 2010 14:10:23 +0200 + +libsoup2.4 (2.30.1-1) unstable; urgency=low [ Emilio Pozuelo Monfort ] * debian/rules: @@ -13,7 +23,7 @@ debian/rules: - Updated for API additions. - -- Stéphane Marguet Tue, 18 May 2010 19:01:59 +0200 + -- Sebastian Dröge Tue, 27 Apr 2010 09:30:37 +0200 libsoup2.4 (2.30.0-1) unstable; urgency=low diff -Nru libsoup2.4-2.30.1/debian/control libsoup2.4-2.30.2/debian/control --- libsoup2.4-2.30.1/debian/control 2010-05-18 18:02:28.000000000 +0100 +++ libsoup2.4-2.30.2/debian/control 2010-07-03 13:10:38.000000000 +0100 @@ -7,7 +7,7 @@ Section: devel Priority: optional Maintainer: Debian GNOME Maintainers -Uploaders: David Weinehall , Emilio Pozuelo Monfort , Sebastian Dröge , Sjoerd Simons +Uploaders: David Weinehall , Sebastian Dröge , Sjoerd Simons Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.13.19), cdbs, diff -Nru libsoup2.4-2.30.1/debian/libsoup2.4-1.symbols libsoup2.4-2.30.2/debian/libsoup2.4-1.symbols --- libsoup2.4-2.30.1/debian/libsoup2.4-1.symbols 2010-04-27 08:45:00.000000000 +0100 +++ libsoup2.4-2.30.2/debian/libsoup2.4-1.symbols 2010-07-02 18:30:52.000000000 +0100 @@ -116,6 +116,7 @@ soup_connection_connect_async@Base 2.4.0 soup_connection_connect_sync@Base 2.4.0 soup_connection_disconnect@Base 2.4.0 + soup_connection_get_ever_used@Base 2.30.2 soup_connection_get_proxy_uri@Base 2.27.4 soup_connection_get_socket@Base 2.4.0 soup_connection_get_state@Base 2.27.4 diff -Nru libsoup2.4-2.30.1/debian/patches/01_disable_tls1.2.patch libsoup2.4-2.30.2/debian/patches/01_disable_tls1.2.patch --- libsoup2.4-2.30.1/debian/patches/01_disable_tls1.2.patch 1970-01-01 01:00:00.000000000 +0100 +++ libsoup2.4-2.30.2/debian/patches/01_disable_tls1.2.patch 2010-07-02 18:25:46.000000000 +0100 @@ -0,0 +1,29 @@ +From 01a43ad9824fba77384534c6d588e0e0d653986e Mon Sep 17 00:00:00 2001 +From: Dan Winship +Date: Tue, 29 Jun 2010 13:43:20 +0000 +Subject: Disable TLS 1.2 in addition to 1.0 and 1.1 + +Due to bug 581342 we want to only negotiate SSL 3.0. Previously we +were telling gnutls to not do TLS1.0 or TLS1.1, but that means with +newer versions of gnutls that support TLS1.2 it would try to negotiate +that instead and generally fail. Fix that by disabling TLS1.2 too +(which works fine even with gnutls versions that don't support TLS1.2 +yet). + +https://bugzilla.gnome.org/show_bug.cgi?id=622857 +--- +diff --git a/libsoup/soup-gnutls.c b/libsoup/soup-gnutls.c +index cb0fbe5..0b57f28 100644 +--- a/libsoup/soup-gnutls.c ++++ b/libsoup/soup-gnutls.c +@@ -477,7 +477,7 @@ soup_ssl_wrap_iochannel (GIOChannel *sock, gboolean non_blocking, + goto THROW_CREATE_ERROR; + + /* See http://bugzilla.gnome.org/show_bug.cgi?id=581342 */ +- if (gnutls_priority_set_direct (session, "NORMAL:!VERS-TLS1.1:!VERS-TLS1.0", NULL) != 0) ++ if (gnutls_priority_set_direct (session, "NORMAL:!VERS-TLS1.2:!VERS-TLS1.1:!VERS-TLS1.0", NULL) != 0) + goto THROW_CREATE_ERROR; + + if (gnutls_credentials_set (session, GNUTLS_CRD_CERTIFICATE, +-- +cgit v0.8.3.1 diff -Nru libsoup2.4-2.30.1/debian/patches/series libsoup2.4-2.30.2/debian/patches/series --- libsoup2.4-2.30.1/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ libsoup2.4-2.30.2/debian/patches/series 2010-07-02 18:25:46.000000000 +0100 @@ -0,0 +1 @@ +01_disable_tls1.2.patch diff -Nru libsoup2.4-2.30.1/docs/reference/html/ch01.html libsoup2.4-2.30.2/docs/reference/html/ch01.html --- libsoup2.4-2.30.1/docs/reference/html/ch01.html 2010-04-26 21:56:18.000000000 +0100 +++ libsoup2.4-2.30.2/docs/reference/html/ch01.html 2010-06-22 18:08:01.000000000 +0100 @@ -21,7 +21,7 @@

-Tutorial

+Tutorial
Compiling with libsoup — Notes on compiling diff -Nru libsoup2.4-2.30.1/docs/reference/html/ch02.html libsoup2.4-2.30.2/docs/reference/html/ch02.html --- libsoup2.4-2.30.1/docs/reference/html/ch02.html 2010-04-26 21:56:18.000000000 +0100 +++ libsoup2.4-2.30.2/docs/reference/html/ch02.html 2010-06-22 18:08:01.000000000 +0100 @@ -21,7 +21,7 @@

-Core API

+Core API
SoupAuth — HTTP client-side authentication support diff -Nru libsoup2.4-2.30.1/docs/reference/html/ch03.html libsoup2.4-2.30.2/docs/reference/html/ch03.html --- libsoup2.4-2.30.1/docs/reference/html/ch03.html 2010-04-26 21:56:18.000000000 +0100 +++ libsoup2.4-2.30.2/docs/reference/html/ch03.html 2010-06-22 18:08:00.000000000 +0100 @@ -21,7 +21,7 @@

-Additional Features

+Additional Features
SoupSessionFeature — Interface for miscellaneous session features diff -Nru libsoup2.4-2.30.1/docs/reference/html/ch04.html libsoup2.4-2.30.2/docs/reference/html/ch04.html --- libsoup2.4-2.30.1/docs/reference/html/ch04.html 2010-04-26 21:56:18.000000000 +0100 +++ libsoup2.4-2.30.2/docs/reference/html/ch04.html 2010-06-22 18:08:01.000000000 +0100 @@ -21,7 +21,7 @@

-Web Services APIs

+Web Services APIs
HTML Form Support @@ -30,7 +30,7 @@ XMLRPC Support — XML-RPC support
-GValue Support — GValue utilities +GValue Support — GValue utilities
diff -Nru libsoup2.4-2.30.1/docs/reference/html/ch05.html libsoup2.4-2.30.2/docs/reference/html/ch05.html --- libsoup2.4-2.30.1/docs/reference/html/ch05.html 2010-04-26 21:56:18.000000000 +0100 +++ libsoup2.4-2.30.2/docs/reference/html/ch05.html 2010-06-22 18:08:01.000000000 +0100 @@ -21,7 +21,7 @@

-GNOME integration

+GNOME integration
soup-gnome-features diff -Nru libsoup2.4-2.30.1/docs/reference/html/ch06.html libsoup2.4-2.30.2/docs/reference/html/ch06.html --- libsoup2.4-2.30.1/docs/reference/html/ch06.html 2010-04-26 21:56:18.000000000 +0100 +++ libsoup2.4-2.30.2/docs/reference/html/ch06.html 2010-06-22 18:08:00.000000000 +0100 @@ -21,7 +21,7 @@

-Low-level Networking API

+Low-level Networking API
SoupAddress — DNS support diff -Nru libsoup2.4-2.30.1/docs/reference/html/index.html libsoup2.4-2.30.2/docs/reference/html/index.html --- libsoup2.4-2.30.1/docs/reference/html/index.html 2010-04-26 21:56:18.000000000 +0100 +++ libsoup2.4-2.30.2/docs/reference/html/index.html 2010-06-22 18:08:01.000000000 +0100 @@ -116,7 +116,7 @@ XMLRPC Support — XML-RPC support
-GValue Support — GValue utilities +GValue Support — GValue utilities
GNOME integration
diff -Nru libsoup2.4-2.30.1/docs/reference/html/index.sgml libsoup2.4-2.30.2/docs/reference/html/index.sgml --- libsoup2.4-2.30.1/docs/reference/html/index.sgml 2010-04-26 21:56:18.000000000 +0100 +++ libsoup2.4-2.30.2/docs/reference/html/index.sgml 2010-06-22 18:08:00.000000000 +0100 @@ -462,6 +462,7 @@ + @@ -812,6 +813,7 @@ + diff -Nru libsoup2.4-2.30.1/docs/reference/html/ix01.html libsoup2.4-2.30.2/docs/reference/html/ix01.html --- libsoup2.4-2.30.1/docs/reference/html/ix01.html 2010-04-26 21:56:18.000000000 +0100 +++ libsoup2.4-2.30.2/docs/reference/html/ix01.html 2010-06-22 18:08:01.000000000 +0100 @@ -20,7 +20,7 @@

-Index

+Index

S

diff -Nru libsoup2.4-2.30.1/docs/reference/html/libsoup-2.4.devhelp libsoup2.4-2.30.2/docs/reference/html/libsoup-2.4.devhelp --- libsoup2.4-2.30.1/docs/reference/html/libsoup-2.4.devhelp 2010-04-26 21:56:18.000000000 +0100 +++ libsoup2.4-2.30.2/docs/reference/html/libsoup-2.4.devhelp 2010-06-22 18:08:00.000000000 +0100 @@ -51,27 +51,27 @@ - - - + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff -Nru libsoup2.4-2.30.1/docs/reference/html/libsoup-2.4.devhelp2 libsoup2.4-2.30.2/docs/reference/html/libsoup-2.4.devhelp2 --- libsoup2.4-2.30.1/docs/reference/html/libsoup-2.4.devhelp2 2010-04-26 21:56:18.000000000 +0100 +++ libsoup2.4-2.30.2/docs/reference/html/libsoup-2.4.devhelp2 2010-06-22 18:08:00.000000000 +0100 @@ -51,27 +51,27 @@ - - - + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -641,6 +641,7 @@ + @@ -713,5 +714,6 @@ + diff -Nru libsoup2.4-2.30.1/docs/reference/html/libsoup-2.4-GValue-Support.html libsoup2.4-2.30.2/docs/reference/html/libsoup-2.4-GValue-Support.html --- libsoup2.4-2.30.1/docs/reference/html/libsoup-2.4-GValue-Support.html 2010-04-26 21:56:18.000000000 +0100 +++ libsoup2.4-2.30.2/docs/reference/html/libsoup-2.4-GValue-Support.html 2010-06-22 18:08:01.000000000 +0100 @@ -31,7 +31,7 @@

GValue Support

-

GValue Support — GValue utilities

+

GValue Support — GValue utilities
@@ -40,46 +40,46 @@ 
 #include <libsoup/soup.h>
 
-GHashTable *        soup_value_hash_new                 (void);
-GHashTable *        soup_value_hash_new_with_vals       (const char *first_key,
+GHashTable *        soup_value_hash_new                 (void);
+GHashTable *        soup_value_hash_new_with_vals       (const char *first_key,
                                                          ...);
-void                soup_value_hash_insert_value        (GHashTable *hash,
+void                soup_value_hash_insert_value        (GHashTable *hash,
                                                          const char *key,
-                                                         GValue *value);
-void                soup_value_hash_insert              (GHashTable *hash,
+                                                         GValue *value);
+void                soup_value_hash_insert              (GHashTable *hash,
                                                          const char *key,
-                                                         GType type,
+                                                         GType type,
                                                          ...);
-void                soup_value_hash_insert_vals         (GHashTable *hash,
+void                soup_value_hash_insert_vals         (GHashTable *hash,
                                                          const char *first_key,
                                                          ...);
-gboolean            soup_value_hash_lookup              (GHashTable *hash,
+gboolean            soup_value_hash_lookup              (GHashTable *hash,
                                                          const char *key,
-                                                         GType type,
+                                                         GType type,
                                                          ...);
-gboolean            soup_value_hash_lookup_vals         (GHashTable *hash,
+gboolean            soup_value_hash_lookup_vals         (GHashTable *hash,
                                                          const char *first_key,
                                                          ...);
 
-GValueArray *       soup_value_array_from_args          (va_list args);
-gboolean            soup_value_array_to_args            (GValueArray *array,
+GValueArray *       soup_value_array_from_args          (va_list args);
+gboolean            soup_value_array_to_args            (GValueArray *array,
                                                          va_list args);
-GValueArray *       soup_value_array_new                (void);
-GValueArray *       soup_value_array_new_with_vals      (GType first_type,
+GValueArray *       soup_value_array_new                (void);
+GValueArray *       soup_value_array_new_with_vals      (GType first_type,
                                                          ...);
-void                soup_value_array_insert             (GValueArray *array,
-                                                         guint index_,
-                                                         GType type,
+void                soup_value_array_insert             (GValueArray *array,
+                                                         guint index_,
+                                                         GType type,
                                                          ...);
-void                soup_value_array_append             (GValueArray *array,
-                                                         GType type,
+void                soup_value_array_append             (GValueArray *array,
+                                                         GType type,
                                                          ...);
-void                soup_value_array_append_vals        (GValueArray *array,
-                                                         GType first_type,
+void                soup_value_array_append_vals        (GValueArray *array,
+                                                         GType first_type,
                                                          ...);
-gboolean            soup_value_array_get_nth            (GValueArray *array,
-                                                         guint index_,
-                                                         GType type,
+gboolean            soup_value_array_get_nth            (GValueArray *array,
+                                                         guint index_,
+                                                         GType type,
                                                          ...);
 
 #define             SOUP_VALUE_SETV                     (val,
@@ -95,9 +95,9 @@
 

 
Description

 

-These methods are useful for manipulating GValues, and in
-particular, arrays and hash tables of GValues, in a
-slightly nicer way than the standard GValue API.
+These methods are useful for manipulating GValues, and in
+particular, arrays and hash tables of GValues, in a
+slightly nicer way than the standard GValue API.
 

 

 They are written for use with soup-xmlrpc, but they also work with
@@ -108,16 +108,16 @@
 
Details

 

 
soup_value_hash_new ()

-
GHashTable *        soup_value_hash_new                 (void);

+
GHashTable *        soup_value_hash_new                 (void);

 

-Creates a GHashTable whose keys are strings and whose values
-are GValue.
+Creates a GHashTable whose keys are strings and whose values
+are GValue.
 

 

-

 
 

 
Returns :
 a new empty GHashTable
+ a new empty GHashTable
 
 

 

@@ -125,11 +125,11 @@
 

 

 
soup_value_hash_new_with_vals ()

-
GHashTable *        soup_value_hash_new_with_vals       (const char *first_key,
+
GHashTable *        soup_value_hash_new_with_vals       (const char *first_key,
                                                          ...);

 

-Creates a GHashTable whose keys are strings and whose values
-are GValue, and initializes it with the provided data. As
+Creates a GHashTable whose keys are strings and whose values
+are GValue, and initializes it with the provided data. As
 with soup_value_hash_insert(), the keys and values are copied
 rather than being inserted directly.
 

@@ -144,12 +144,12 @@
 
 
... :

 the type of first_key, followed by the value, followed
-by additional key/type/value triplets, terminated by NULL
+by additional key/type/value triplets, terminated by NULL
 
 
 
 
Returns :

- a new GHashTable, initialized with the given values
+ a new GHashTable, initialized with the given values
 
 
 
@@ -158,11 +158,11 @@
 

 

 
soup_value_hash_insert_value ()

-
void                soup_value_hash_insert_value        (GHashTable *hash,
+
void                soup_value_hash_insert_value        (GHashTable *hash,
                                                          const char *key,
-                                                         GValue *value);

+                                                         GValue *value);

 

-Inserts value into hash. (Unlike with g_hash_table_insert(), both
+Inserts value into hash. (Unlike with g_hash_table_insert(), both
 the key and the value are copied).
 

 

@@ -189,13 +189,13 @@
 

 
soup_value_hash_insert ()

-
void                soup_value_hash_insert              (GHashTable *hash,
+
void                soup_value_hash_insert              (GHashTable *hash,
                                                          const char *key,
-                                                         GType type,
+                                                         GType type,
                                                          ...);

 

 Inserts the provided value of type type into hash. (Unlike with
-g_hash_table_insert(), both the key and the value are copied).
+g_hash_table_insert(), both the key and the value are copied).
 

 

 
@@ -212,7 +212,7 @@
 
-
@@ -226,7 +226,7 @@
 

 
soup_value_hash_insert_vals ()

-
void                soup_value_hash_insert_vals         (GHashTable *hash,
+
void                soup_value_hash_insert_vals         (GHashTable *hash,
                                                          const char *first_key,
                                                          ...);

 

@@ -250,7 +250,7 @@
 

@@ -259,9 +259,9 @@
 

 
soup_value_hash_lookup ()

-
gboolean            soup_value_hash_lookup              (GHashTable *hash,
+
gboolean            soup_value_hash_lookup              (GHashTable *hash,
                                                          const char *key,
-                                                         GType type,
+                                                         GType type,
                                                          ...);

 

 Looks up key in hash and stores its value into the provided
@@ -282,7 +282,7 @@
 
 

-
@@ -292,8 +292,8 @@
 
-
@@ -302,7 +302,7 @@
 

 
soup_value_hash_lookup_vals ()

-
gboolean            soup_value_hash_lookup_vals         (GHashTable *hash,
+
gboolean            soup_value_hash_lookup_vals         (GHashTable *hash,
                                                          const char *first_key,
                                                          ...);

 

@@ -325,12 +325,12 @@
 

-
-
+
@@ -478,15 +478,15 @@
 

 
soup_message_body_set_accumulate ()

 
void                soup_message_body_set_accumulate    (SoupMessageBody *body,
-                                                         gboolean accumulate);

+                                                         gboolean accumulate);
 

 Sets or clears the accumulate flag on body. (The default value is
-TRUE.) If set to FALSE, body's data field will not be filled in
+TRUE.) If set to FALSE, body's data field will not be filled in
 after the body is fully sent/received, and the chunks that make up
 body may be discarded when they are no longer needed.
 

 

-In particular, if you set this flag to FALSE on an "incoming"
+In particular, if you set this flag to FALSE on an "incoming"
 message body (that is, the response_body of a client-side message,
 or request_body of a server-side message), this will cause each
 chunk of the body to be discarded after its corresponding
@@ -495,13 +495,13 @@
 message.)
 

 

-If you set this flag to FALSE on the response_body of a
+If you set this flag to FALSE on the response_body of a
 server-side message, it will cause each chunk of the body to be
 discarded after its corresponding "wrote_chunk" signal
 is emitted.
 

 

-(If you set the flag to FALSE on the request_body of a
+(If you set the flag to FALSE on the request_body of a
 client-side message, it will block the accumulation of chunks into
 body's data field, but it will not cause the chunks to be
 discarded after being written like in the server-side
@@ -529,7 +529,7 @@
 

 

 
soup_message_body_get_accumulate ()

-
gboolean            soup_message_body_get_accumulate    (SoupMessageBody *body);

+
gboolean            soup_message_body_get_accumulate    (SoupMessageBody *body);

 

 Gets the accumulate flag on body; see
 soup_message_body_set_accumulate() for details.
@@ -557,8 +557,8 @@
 
soup_message_body_append ()

 
void                soup_message_body_append            (SoupMessageBody *body,
                                                          SoupMemoryUse use,
-                                                         gconstpointer data,
-                                                         gsize length);

+                                                         gconstpointer data,
+                                                         gsize length);
 

 Appends length bytes from data to body according to use.
 

@@ -577,7 +577,7 @@
 
 

-
@@ -678,7 +678,7 @@
 

 
soup_message_body_get_chunk ()

 
SoupBuffer *        soup_message_body_get_chunk         (SoupMessageBody *body,
-                                                         goffset offset);

+                                                         goffset offset);
 

 Gets a SoupBuffer containing data from body starting at offset.
 The size of the returned chunk is unspecified. You can iterate
@@ -693,7 +693,7 @@
 soup_message_body_complete() has been called or not; if it has,
 then soup_message_body_get_chunk() will return a 0-length chunk
 (indicating the end of body). If it has not, then
-soup_message_body_get_chunk() will return NULL (indicating that
+soup_message_body_get_chunk() will return NULL (indicating that
 body may still potentially have more data, but that data is not
 currently available).
 

@@ -712,7 +712,7 @@
 

-
@@ -727,7 +727,7 @@
 Handles the SoupMessageBody part of receiving a chunk of data from
 the network. Normally this means appending chunk to body, exactly
 as with soup_message_body_append_buffer(), but if you have set
-body's accumulate flag to FALSE, then that will not happen.
+body's accumulate flag to FALSE, then that will not happen.
 

 This is a low-level method which you should not normally need to
@@ -758,7 +758,7 @@
 

 Handles the SoupMessageBody part of writing a chunk of data to the
 network. Normally this is a no-op, but if you have set body's
-accumulate flag to FALSE, then this will cause chunk to be
+accumulate flag to FALSE, then this will cause chunk to be
 discarded to free up memory.
 

diff -Nru libsoup2.4-2.30.1/docs/reference/html/libsoup-2.4-SoupMessageHeaders.html libsoup2.4-2.30.2/docs/reference/html/libsoup-2.4-SoupMessageHeaders.html
--- libsoup2.4-2.30.1/docs/reference/html/libsoup-2.4-SoupMessageHeaders.html	2010-04-26 21:56:18.000000000 +0100
+++ libsoup2.4-2.30.2/docs/reference/html/libsoup-2.4-SoupMessageHeaders.html	2010-06-22 18:08:01.000000000 +0100
@@ -63,15 +63,15 @@
 
 void                (*SoupMessageHeadersForeachFunc)    (const char *name,
                                                          const char *value,
-                                                         gpointer user_data);
+                                                         gpointer user_data);
 void                soup_message_headers_foreach        (SoupMessageHeaders *hdrs,
                                                          SoupMessageHeadersForeachFunc func,
-                                                         gpointer user_data);
+                                                         gpointer user_data);
 
                     SoupMessageHeadersIter;
 void                soup_message_headers_iter_init      (SoupMessageHeadersIter *iter,
                                                          SoupMessageHeaders *hdrs);
-gboolean            soup_message_headers_iter_next      (SoupMessageHeadersIter *iter,
+gboolean            soup_message_headers_iter_next      (SoupMessageHeadersIter *iter,
                                                          const char **name,
                                                          const char **value);
 
@@ -79,11 +79,11 @@
 SoupEncoding        soup_message_headers_get_encoding   (SoupMessageHeaders *hdrs);
 void                soup_message_headers_set_encoding   (SoupMessageHeaders *hdrs,
                                                          SoupEncoding encoding);
-goffset             soup_message_headers_get_content_length
+goffset             soup_message_headers_get_content_length
                                                         (SoupMessageHeaders *hdrs);
 void                soup_message_headers_set_content_length
                                                         (SoupMessageHeaders *hdrs,
-                                                         goffset content_length);
+                                                         goffset content_length);
 
 enum                SoupExpectation;
 SoupExpectation     soup_message_headers_get_expectations
@@ -94,44 +94,44 @@
 
 const char *        soup_message_headers_get_content_type
                                                         (SoupMessageHeaders *hdrs,
-                                                         GHashTable **params);
+                                                         GHashTable **params);
 void                soup_message_headers_set_content_type
                                                         (SoupMessageHeaders *hdrs,
                                                          const char *content_type,
-                                                         GHashTable *params);
+                                                         GHashTable *params);
 
-gboolean            soup_message_headers_get_content_disposition
+gboolean            soup_message_headers_get_content_disposition
                                                         (SoupMessageHeaders *hdrs,
                                                          char **disposition,
-                                                         GHashTable **params);
+                                                         GHashTable **params);
 void                soup_message_headers_set_content_disposition
                                                         (SoupMessageHeaders *hdrs,
                                                          const char *disposition,
-                                                         GHashTable *params);
+                                                         GHashTable *params);
 
                     SoupRange;
-gboolean            soup_message_headers_get_ranges     (SoupMessageHeaders *hdrs,
-                                                         goffset total_length,
+gboolean            soup_message_headers_get_ranges     (SoupMessageHeaders *hdrs,
+                                                         goffset total_length,
                                                          SoupRange **ranges,
                                                          int *length);
 void                soup_message_headers_set_ranges     (SoupMessageHeaders *hdrs,
                                                          SoupRange *ranges,
                                                          int length);
 void                soup_message_headers_set_range      (SoupMessageHeaders *hdrs,
-                                                         goffset start,
-                                                         goffset end);
+                                                         goffset start,
+                                                         goffset end);
 void                soup_message_headers_free_ranges    (SoupMessageHeaders *hdrs,
                                                          SoupRange *ranges);
-gboolean            soup_message_headers_get_content_range
+gboolean            soup_message_headers_get_content_range
                                                         (SoupMessageHeaders *hdrs,
-                                                         goffset *start,
-                                                         goffset *end,
-                                                         goffset *total_length);
+                                                         goffset *start,
+                                                         goffset *end,
+                                                         goffset *total_length);
 void                soup_message_headers_set_content_range
                                                         (SoupMessageHeaders *hdrs,
-                                                         goffset start,
-                                                         goffset end,
-                                                         goffset total_length);
+                                                         goffset start,
+                                                         goffset end,
+                                                         goffset total_length);
 
 
 

@@ -370,7 +370,7 @@
 
 

-
@@ -413,7 +413,7 @@
 
-
@@ -470,7 +470,7 @@
 
SoupMessageHeadersForeachFunc ()
void                (*SoupMessageHeadersForeachFunc)    (const char *name,
                                                          const char *value,
-                                                         gpointer user_data);

+                                                         gpointer user_data);

 The callback passed to soup_message_headers_foreach().
 

@@ -500,7 +500,7 @@
 
soup_message_headers_foreach ()
void                soup_message_headers_foreach        (SoupMessageHeaders *hdrs,
                                                          SoupMessageHeadersForeachFunc func,
-                                                         gpointer user_data);

+                                                         gpointer user_data);

 Calls func once for each header value in hdrs.
 

@@ -570,8 +570,7 @@
 
-
@@ -585,13 +584,13 @@
 

 
soup_message_headers_iter_next ()

-
gboolean            soup_message_headers_iter_next      (SoupMessageHeadersIter *iter,
+
gboolean            soup_message_headers_iter_next      (SoupMessageHeadersIter *iter,
                                                          const char **name,
                                                          const char **value);

 

 Yields the next name/value pair in the SoupMessageHeaders being
 iterated by iter. If iter has already yielded the last header,
-then soup_message_headers_iter_next() will return FALSE and name
+then soup_message_headers_iter_next() will return FALSE and name
 and value will be unchanged.
 

 

 

 

 
type :
a GType
+a GType
 
 

 

 

 
... :

 the type of first_key, followed by the value, followed
-by additional key/type/value triplets, terminated by NULL
+by additional key/type/value triplets, terminated by NULL
 
 

 
 

 
type :
a GType
+a GType
 
 

 

 

 
Returns :
 TRUE if hash contained a value with key key and
-type type, FALSE if not.
+ TRUE if hash contained a value with key key and
+type type, FALSE if not.
 
 

 
 
... :

 the type of first_key, a pointer to that type, and
 then additional key/type/pointer triplets, terminated
-by NULL.
+by NULL.
 
 

 

 
Returns :
 TRUE if all of the keys were found, FALSE
+ TRUE if all of the keys were found, FALSE
 if any were missing; note that you will generally need to
 initialize each destination variable to a reasonable default
 value, since there is no way to tell which keys were found
@@ -343,11 +343,11 @@
 

 

 
soup_value_array_from_args ()

-
GValueArray *       soup_value_array_from_args          (va_list args);

+
GValueArray *       soup_value_array_from_args          (va_list args);

 

-Creates a GValueArray from the provided arguments, which must
-consist of pairs of a GType and a value of that type, terminated
-by G_TYPE_INVALID. (The array will contain copies of the provided
+Creates a GValueArray from the provided arguments, which must
+consist of pairs of a GType and a value of that type, terminated
+by G_TYPE_INVALID. (The array will contain copies of the provided
 data rather than pointing to the passed-in data directly.)
 

 

@@ -355,12 +355,12 @@
 
-
-
@@ -369,12 +369,12 @@
 

 
soup_value_array_to_args ()

-
gboolean            soup_value_array_to_args            (GValueArray *array,
+
gboolean            soup_value_array_to_args            (GValueArray *array,
                                                          va_list args);

 

-Extracts a GValueArray into the provided arguments, which must
-consist of pairs of a GType and a value of pointer-to-that-type,
-terminated by G_TYPE_INVALID. The returned values will point to the
+Extracts a GValueArray into the provided arguments, which must
+consist of pairs of a GType and a value of pointer-to-that-type,
+terminated by G_TYPE_INVALID. The returned values will point to the
 same memory as the values in the array.
 

 

 

 
args :
arguments to create a GValueArray from
+arguments to create a GValueArray from
 
 

 

 
Returns :
 a new GValueArray, or NULL if an error occurred.
+ a new GValueArray, or NULL if an error occurred.
 
 

 
 

@@ -382,7 +382,7 @@
 
-
@@ -401,16 +401,16 @@
 

 
soup_value_array_new ()

-
GValueArray *       soup_value_array_new                (void);

+
GValueArray *       soup_value_array_new                (void);

 

-Creates a new GValueArray. (This is just a wrapper around
-g_value_array_new(), for naming consistency purposes.)
+Creates a new GValueArray. (This is just a wrapper around
+g_value_array_new(), for naming consistency purposes.)
 

 

 

 
array :
a GValueArray
+a GValueArray
 
 

 

 

-

 
 

 
Returns :
 a new GValueArray
+ a new GValueArray
 
 

 

@@ -418,10 +418,10 @@
 

 

 
soup_value_array_new_with_vals ()

-
GValueArray *       soup_value_array_new_with_vals      (GType first_type,
+
GValueArray *       soup_value_array_new_with_vals      (GType first_type,
                                                          ...);

 

-Creates a new GValueArray and copies the provided values
+Creates a new GValueArray and copies the provided values
 into it.
 

 

@@ -435,12 +435,12 @@
 
-
@@ -449,13 +449,13 @@
 

 
soup_value_array_insert ()

-
void                soup_value_array_insert             (GValueArray *array,
-                                                         guint index_,
-                                                         GType type,
+
void                soup_value_array_insert             (GValueArray *array,
+                                                         guint index_,
+                                                         GType type,
                                                          ...);

 

 Inserts the provided value of type type into array as with
-g_value_array_insert(). (The provided data is copied rather than
+g_value_array_insert(). (The provided data is copied rather than
 being inserted directly.)
 

 

 
... :

 the first value to add, followed by other type/value
-pairs, terminated by G_TYPE_INVALID
+pairs, terminated by G_TYPE_INVALID
 
 

 

 
Returns :
 a new GValueArray
+ a new GValueArray
 
 

 
 

@@ -463,7 +463,7 @@
 
-
@@ -473,7 +473,7 @@
 
-
@@ -487,12 +487,12 @@
 

 
soup_value_array_append ()

-
void                soup_value_array_append             (GValueArray *array,
-                                                         GType type,
+
void                soup_value_array_append             (GValueArray *array,
+                                                         GType type,
                                                          ...);

 

 Appends the provided value of type type to array as with
-g_value_array_append(). (The provided data is copied rather than
+g_value_array_append(). (The provided data is copied rather than
 being inserted directly.)
 

 

 

 
array :
a GValueArray
+a GValueArray
 
 

 

 

 
type :
a GType
+a GType
 
 

 

 

@@ -500,12 +500,12 @@
 
-
-
@@ -519,12 +519,12 @@
 

 
soup_value_array_append_vals ()

-
void                soup_value_array_append_vals        (GValueArray *array,
-                                                         GType first_type,
+
void                soup_value_array_append_vals        (GValueArray *array,
+                                                         GType first_type,
                                                          ...);

 

 Appends the provided values into array as with
-g_value_array_append(). (The provided data is copied rather than
+g_value_array_append(). (The provided data is copied rather than
 being inserted directly.)
 

 

 

 
array :
a GValueArray
+a GValueArray
 
 

 

 
type :
a GType
+a GType
 
 

 

 

@@ -532,7 +532,7 @@
 
-
@@ -543,7 +543,7 @@
 
@@ -552,9 +552,9 @@
 

 
soup_value_array_get_nth ()

-
gboolean            soup_value_array_get_nth            (GValueArray *array,
-                                                         guint index_,
-                                                         GType type,
+
gboolean            soup_value_array_get_nth            (GValueArray *array,
+                                                         guint index_,
+                                                         GType type,
                                                          ...);

 

 Gets the index_ element of array and stores its value into the
@@ -565,7 +565,7 @@
 

-
@@ -575,7 +575,7 @@
 
-
@@ -585,8 +585,8 @@
 
-
@@ -599,19 +599,19 @@
 

 Copies an argument of type type from args into val. val will
 point directly to the value in args rather than copying it, so you
-must g_value_copy() it if you want it to remain valid.
+must g_value_copy() it if you want it to remain valid.
 

 

 
array :
a GValueArray
+a GValueArray
 
 

 

 
... :

 the first value to add, followed by other type/value
-pairs, terminated by G_TYPE_INVALID
+pairs, terminated by G_TYPE_INVALID
 
 

 
 
 

 
array :
a GValueArray
+a GValueArray
 
 

 

 

 
type :
a GType
+a GType
 
 

 

 

 
Returns :
 TRUE if array contained a value with index index_
-and type type, FALSE if not.
+ TRUE if array contained a value with index index_
+and type type, FALSE if not.
 
 

 
 

-
-
@@ -637,12 +637,12 @@
 
-
-
@@ -660,7 +660,7 @@
 
#define SOUP_TYPE_BYTE_ARRAY (soup_byte_array_get_type ())
 

-glib does not define a GType for GByteArray, so libsoup
+glib does not define a GType for GByteArray, so libsoup
 defines this one itself.
 

diff -Nru libsoup2.4-2.30.1/docs/reference/html/libsoup-2.4-HTML-Form-Support.html libsoup2.4-2.30.2/docs/reference/html/libsoup-2.4-HTML-Form-Support.html
--- libsoup2.4-2.30.1/docs/reference/html/libsoup-2.4-HTML-Form-Support.html	2010-04-26 21:56:18.000000000 +0100
+++ libsoup2.4-2.30.2/docs/reference/html/libsoup-2.4-HTML-Form-Support.html	2010-06-22 18:08:01.000000000 +0100
@@ -42,16 +42,16 @@
 
 #define             SOUP_FORM_MIME_TYPE_MULTIPART
 #define             SOUP_FORM_MIME_TYPE_URLENCODED
-GHashTable *        soup_form_decode                    (const char *encoded_form);
-GHashTable *        soup_form_decode_multipart          (SoupMessage *msg,
+GHashTable *        soup_form_decode                    (const char *encoded_form);
+GHashTable *        soup_form_decode_multipart          (SoupMessage *msg,
                                                          const char *file_control_name,
                                                          char **filename,
                                                          char **content_type,
                                                          SoupBuffer **file);
 char *              soup_form_encode                    (const char *first_field,
                                                          ...);
-char *              soup_form_encode_datalist           (GData **form_data_set);
-char *              soup_form_encode_hash               (GHashTable *form_data_set);
+char *              soup_form_encode_datalist           (GData **form_data_set);
+char *              soup_form_encode_hash               (GHashTable *form_data_set);
 char *              soup_form_encode_valist             (const char *first_field,
                                                          va_list args);
 SoupMessage *       soup_form_request_new               (const char *method,
@@ -60,10 +60,10 @@
                                                          ...);
 SoupMessage *       soup_form_request_new_from_datalist (const char *method,
                                                          const char *uri,
-                                                         GData **form_data_set);
+                                                         GData **form_data_set);
 SoupMessage *       soup_form_request_new_from_hash     (const char *method,
                                                          const char *uri,
-                                                         GHashTable *form_data_set);
+                                                         GHashTable *form_data_set);
 SoupMessage *       soup_form_request_new_from_multipart
                                                         (const char *uri,
                                                          SoupMultipart *multipart);
@@ -102,7 +102,7 @@
 

 
soup_form_decode ()

-
GHashTable *        soup_form_decode                    (const char *encoded_form);

+
GHashTable *        soup_form_decode                    (const char *encoded_form);

 

 Decodes form, which is an urlencoded dataset as defined in the
 HTML 4.01 spec.
@@ -117,9 +117,8 @@
 

-
@@ -128,7 +127,7 @@
 

 
soup_form_decode_multipart ()

-
GHashTable *        soup_form_decode_multipart          (SoupMessage *msg,
+
GHashTable *        soup_form_decode_multipart          (SoupMessage *msg,
                                                          const char *file_control_name,
                                                          char **filename,
                                                          char **content_type,
@@ -142,14 +141,14 @@
 soup_form_decode_multipart() will extract the uploaded file data
 into filename, content_type, and file. All of the other form
 control data will be returned (as strings, as with
-soup_form_decode()) in the returned GHashTable.
+soup_form_decode()) in the returned GHashTable.
 

 

-You may pass NULL for filename and/or content_type if you do not
+You may pass NULL for filename and/or content_type if you do not
 care about those fields. soup_form_decode_multipart() may also
-return NULL in those fields if the client did not provide that
+return NULL in those fields if the client did not provide that
 information. You must free the returned filename and content-type
-with g_free(), and the returned file data with soup_buffer_free().
+with g_free(), and the returned file data with soup_buffer_free().
 

 

 If you have a form with more than one file upload control, you will
@@ -166,7 +165,7 @@
 
 

-
@@ -188,7 +187,7 @@
 
@@ -223,7 +222,7 @@
 
@@ -237,7 +236,7 @@
 

 
soup_form_encode_datalist ()

-
char *              soup_form_encode_datalist           (GData **form_data_set);

+
char *              soup_form_encode_datalist           (GData **form_data_set);

 

 Encodes form_data_set into a value of type
 "application/x-www-form-urlencoded", as defined in the HTML 4.01
@@ -263,7 +262,7 @@
 

 

 
soup_form_encode_hash ()

-
char *              soup_form_encode_hash               (GHashTable *form_data_set);

+
char *              soup_form_encode_hash               (GHashTable *form_data_set);

 

 Encodes form_data_set into a value of type
 "application/x-www-form-urlencoded", as defined in the HTML 4.01
@@ -280,8 +279,7 @@
 

-
@@ -357,7 +355,7 @@
 
@@ -373,7 +371,7 @@
 
soup_form_request_new_from_datalist ()
SoupMessage *       soup_form_request_new_from_datalist (const char *method,
                                                          const char *uri,
-                                                         GData **form_data_set);

+                                                         GData **form_data_set);

 Creates a new SoupMessage and sets it up to send form_data_set to
 uri via method, as with soup_form_request_new().
@@ -409,7 +407,7 @@
 
soup_form_request_new_from_hash ()
SoupMessage *       soup_form_request_new_from_hash     (const char *method,
                                                          const char *uri,
-                                                         GHashTable *form_data_set);

+                                                         GHashTable *form_data_set);

 Creates a new SoupMessage and sets it up to send form_data_set to
 uri via method, as with soup_form_request_new().
@@ -429,7 +427,7 @@
 

-
diff -Nru libsoup2.4-2.30.1/docs/reference/html/libsoup-2.4-SoupCookie.html libsoup2.4-2.30.2/docs/reference/html/libsoup-2.4-SoupCookie.html
--- libsoup2.4-2.30.1/docs/reference/html/libsoup-2.4-SoupCookie.html	2010-04-26 21:56:18.000000000 +0100
+++ libsoup2.4-2.30.2/docs/reference/html/libsoup-2.4-SoupCookie.html	2010-06-22 18:08:01.000000000 +0100
@@ -49,7 +49,7 @@
 SoupCookie *        soup_cookie_parse                   (const char *header,
                                                          SoupURI *origin);
 SoupCookie *        soup_cookie_copy                    (SoupCookie *cookie);
-gbooleansoup_cookie_equal                   (SoupCookie *cookie1,
+gbooleansoup_cookie_equal                   (SoupCookie *cookie1,
                                                          SoupCookie *cookie2);
 voidsoup_cookie_free                    (SoupCookie *cookie);
 
@@ -70,24 +70,24 @@
 voidsoup_cookie_set_expires             (SoupCookie *cookie,
                                                          SoupDate *expires);
 voidsoup_cookie_set_secure              (SoupCookie *cookie,
-                                                         gboolean secure);
+                                                         gboolean secure);
 voidsoup_cookie_set_http_only           (SoupCookie *cookie,
-                                                         gboolean http_only);
+                                                         gboolean http_only);
 
-gbooleansoup_cookie_applies_to_uri          (SoupCookie *cookie,
+gbooleansoup_cookie_applies_to_uri          (SoupCookie *cookie,
                                                          SoupURI *uri);
 
 char *              soup_cookie_to_cookie_header        (SoupCookie *cookie);
 char *              soup_cookie_to_set_cookie_header    (SoupCookie *cookie);
 
-GSList *            soup_cookies_from_request           (SoupMessage *msg);
-GSList *            soup_cookies_from_response          (SoupMessage *msg);
-voidsoup_cookies_to_request             (GSList *cookies,
+GSList *            soup_cookies_from_request           (SoupMessage *msg);
+GSList *            soup_cookies_from_response          (SoupMessage *msg);
+voidsoup_cookies_to_request             (GSList *cookies,
                                                          SoupMessage *msg);
-voidsoup_cookies_to_response            (GSList *cookies,
+voidsoup_cookies_to_response            (GSList *cookies,
                                                          SoupMessage *msg);
-char *              soup_cookies_to_cookie_header       (GSList *cookies);
-voidsoup_cookies_free                   (GSList *cookies);
+char *              soup_cookies_to_cookie_header       (GSList *cookies);
+voidsoup_cookies_free                   (GSList *cookies);
 

@@ -135,9 +135,9 @@
 is a hostname and must match exactly.
 

 

-expires will be non-NULL if the cookie uses either the original
+expires will be non-NULL if the cookie uses either the original
 "expires" attribute, or the "max-age" attribute specified in RFC
-2109. If expires is NULL, it indicates that neither "expires" nor
+2109. If expires is NULL, it indicates that neither "expires" nor
 "max-age" was specified, and the cookie expires at the end of the
 session.
 

@@ -167,24 +167,24 @@
 

-
-
-
+
-
+
@@ -235,7 +235,7 @@
 
-
@@ -264,8 +264,8 @@
 

 If header does not have "path" or "domain" attributes, they will
-be defaulted from origin. If origin is NULL, path will default
-to "/", but domain will be left as NULL. Note that this is not a
+be defaulted from origin. If origin is NULL, path will default
+to "/", but domain will be left as NULL. Note that this is not a
 valid state for a SoupCookie, and you will need to fill in some
 appropriate string for the domain if you want to actually make use
 of the cookie.
@@ -280,12 +280,12 @@
 

-
-
-
@@ -578,9 +578,9 @@
 

 
soup_cookie_set_secure ()

 
void                soup_cookie_set_secure              (SoupCookie *cookie,
-                                                         gboolean secure);

+                                                         gboolean secure);
 

-Sets cookie's secure attribute to secure. If TRUE, cookie will
+Sets cookie's secure attribute to secure. If TRUE, cookie will
 only be transmitted from the client to the server over secure
 (https) connections.
 

@@ -605,9 +605,9 @@
 

 
soup_cookie_set_http_only ()

 
void                soup_cookie_set_http_only           (SoupCookie *cookie,
-                                                         gboolean http_only);

+                                                         gboolean http_only);
 

-Sets cookie's HttpOnly attribute to http_only. If TRUE, cookie
+Sets cookie's HttpOnly attribute to http_only. If TRUE, cookie
 will be marked as "http only", meaning it should not be exposed to
 web page scripts or other untrusted code.
 

@@ -631,7 +631,7 @@
 

 

 
soup_cookie_applies_to_uri ()

-
gboolean            soup_cookie_applies_to_uri          (SoupCookie *cookie,
+
gboolean            soup_cookie_applies_to_uri          (SoupCookie *cookie,
                                                          SoupURI *uri);

 

 Tests if cookie should be sent to uri.
@@ -656,7 +656,7 @@
 
 

-
@@ -720,9 +720,9 @@
 

 
soup_cookies_from_request ()

-
GSList *            soup_cookies_from_request           (SoupMessage *msg);

+
GSList *            soup_cookies_from_request           (SoupMessage *msg);

 

-Parses msg's Cookie request header and returns a GSList of
+Parses msg's Cookie request header and returns a GSList of
 SoupCookies. As the "Cookie" header, unlike "Set-Cookie",
 only contains cookie names and values, none of the other
 SoupCookie fields will be filled in. (Thus, you can't generally
@@ -739,9 +739,9 @@
 

-
@@ -751,9 +751,9 @@
 

 
soup_cookies_from_response ()

-
GSList *            soup_cookies_from_response          (SoupMessage *msg);

+
GSList *            soup_cookies_from_response          (SoupMessage *msg);

 

-Parses msg's Set-Cookie response headers and returns a GSList of
+Parses msg's Set-Cookie response headers and returns a GSList of
 SoupCookies. Cookies that do not specify "path" or
 "domain" attributes will have their values defaulted from msg.
 

@@ -767,9 +767,9 @@
 
 

-
@@ -779,7 +779,7 @@
 

 
soup_cookies_to_request ()

-
void                soup_cookies_to_request             (GSList *cookies,
+
void                soup_cookies_to_request             (GSList *cookies,
                                                          SoupMessage *msg);

 

 Adds the name and value of each cookie in cookies to msg's
@@ -793,7 +793,7 @@
 

-
@@ -808,7 +808,7 @@
 

 
soup_cookies_to_response ()

-
void                soup_cookies_to_response            (GSList *cookies,
+
void                soup_cookies_to_response            (GSList *cookies,
                                                          SoupMessage *msg);

 

 Appends a "Set-Cookie" response header to msg for each cookie in
@@ -820,7 +820,7 @@
 

-
@@ -835,9 +835,9 @@
 

 
soup_cookies_to_cookie_header ()

-
char *              soup_cookies_to_cookie_header       (GSList *cookies);

+
char *              soup_cookies_to_cookie_header       (GSList *cookies);

 

-Serializes a GSList of SoupCookie into a string suitable for
+Serializes a GSList of SoupCookie into a string suitable for
 setting as the value of the "Cookie" header.
 

 

 
 
 

 
val :
a GValue
+a GValue
 
 

 

 
type :
a GType
+a GType
 
 

 

 

 
val :
a GValue
+a GValue
 
 

 

 
type :
a GType
+a GType
 
 

 

 
 
 

 

 
Returns :
 a hash table containing the
-name/value pairs from encoded_form, which you can free with
-g_hash_table_destroy().. [element-type utf8 utf8]
+ a hash table containing the name/value pairs from
+encoded_form, which you can free with g_hash_table_destroy().
 
 

 
 

 
file_control_name :
the name of the HTML file upload control, or NULL
+the name of the HTML file upload control, or NULL
 
 

 
Returns :

  a hash table containing the name/value pairs (other
 than file_control_name) from msg, which you can free with
-g_hash_table_destroy(). On error, it will return NULL.
+g_hash_table_destroy(). On error, it will return NULL.
 
 
 

 
... :

 value of first_field, followed by additional field names
-and values, terminated by NULL.
+and values, terminated by NULL.
 
 

 

 

 

 
form_data_set :
 a hash table containing
-name/value pairs (as strings). [element-type utf8 utf8]
+a hash table containing name/value pairs (as strings)
 
 

 

 
... :

 value of first_field, followed by additional field names
-and values, terminated by NULL.
+and values, terminated by NULL.
 
 

 

 
 
 
 

 

 
form_data_set :
 the data to send to uri. [element-type utf8 utf8]
+the data to send to uri
 
 

 
                                                                                                                                                                                                                
 
 

 

 
char *path;
the "path" attribute, or NULL
+the "path" attribute, or NULL
 
 

 

 
SoupDate *expires;
the cookie expiration time, or NULL for a session cookie
+the cookie expiration time, or NULL for a session cookie
 
 

 
gboolean secure;
gboolean secure;

 
-TRUE if the cookie should only be tranferred over SSL
+TRUE if the cookie should only be tranferred over SSL
 
 

 
gboolean http_only;
gboolean http_only;

 
-TRUE if the cookie should not be exposed to scripts
+TRUE if the cookie should not be exposed to scripts
 
 

 
 

 
path :
cookie path, or NULL
+cookie path, or NULL
 
 

 

 

 

 
origin :
origin of the cookie, or NULL
+origin of the cookie, or NULL
 
 

 

 
Returns :
 a new SoupCookie, or NULL if it could not be
+ a new SoupCookie, or NULL if it could not be
 parsed, or contained an illegal "domain" attribute for a cookie
 originating from origin.
 
@@ -323,7 +323,7 @@
 

 

 
soup_cookie_equal ()

-
gboolean            soup_cookie_equal                   (SoupCookie *cookie1,
+
gboolean            soup_cookie_equal                   (SoupCookie *cookie1,
                                                          SoupCookie *cookie2);

 

 

@@ -550,7 +550,7 @@
 
void                soup_cookie_set_expires             (SoupCookie *cookie,
                                                          SoupDate *expires);

 

-Sets cookie's expiration time to expires. If expires is NULL,
+Sets cookie's expiration time to expires. If expires is NULL,
 cookie will be a session cookie and will expire at the end of the
 client's session.
 

@@ -567,7 +567,7 @@
 

 

 
expires :
the new expiration time, or NULL
+the new expiration time, or NULL
 
 

 

 
Returns :
 TRUE if cookie should be sent to uri, FALSE if
+ TRUE if cookie should be sent to uri, FALSE if
 not
 
 
 

 

 
Returns :
 a GSList of
-SoupCookies, which can be freed with soup_cookies_free().
-. [element-type SoupCookie]
+ a GSList of SoupCookies, which can be freed
+with soup_cookies_free().
+
 
 

 
 

 
Returns :
 a GSList of
-SoupCookies, which can be freed with soup_cookies_free().
-. [element-type SoupCookie]
+ a GSList of SoupCookies, which can be freed
+with soup_cookies_free().
+
 
 

 
 
 

 
cookies :
 a GSList of SoupCookie. [element-type SoupCookie]
+a GSList of SoupCookie
 
 

 

 

 

 
cookies :
 a GSList of SoupCookie. [element-type SoupCookie]
+a GSList of SoupCookie
 
 

 

 

@@ -845,7 +845,7 @@
 
-
@@ -861,7 +861,7 @@
 

 
soup_cookies_free ()

-
void                soup_cookies_free                   (GSList *cookies);

+
void                soup_cookies_free                   (GSList *cookies);

 

 Frees cookies.
 

@@ -869,7 +869,7 @@
 

-

 

 
cookies :
 a GSList of SoupCookie. [element-type SoupCookie]
+a GSList of SoupCookie
 
 

 

 

 

 
cookies :
 a GSList of SoupCookie. [element-type SoupCookie]
+a GSList of SoupCookie
 
 

 

diff -Nru libsoup2.4-2.30.1/docs/reference/html/libsoup-2.4-soup-gnome-features.html libsoup2.4-2.30.2/docs/reference/html/libsoup-2.4-soup-gnome-features.html
--- libsoup2.4-2.30.1/docs/reference/html/libsoup-2.4-soup-gnome-features.html	2010-04-26 21:56:18.000000000 +0100
+++ libsoup2.4-2.30.2/docs/reference/html/libsoup-2.4-soup-gnome-features.html	2010-06-22 18:08:01.000000000 +0100
@@ -56,7 +56,7 @@
 
#define SOUP_TYPE_GNOME_FEATURES_2_26 (soup_gnome_features_2_26_get_type ())
 

 

-This returns the GType of a SoupSessionFeature that automatically
+This returns the GType of a SoupSessionFeature that automatically
 adds all of the GNOME features defined for libsoup 2.26 (which is
 just SOUP_TYPE_PROXY_RESOLVER_GNOME).
 

@@ -73,7 +73,7 @@
 
#define SOUP_TYPE_PROXY_RESOLVER_GNOME (soup_proxy_resolver_gnome_get_type ())
 

 

-This returns the GType of a SoupProxyResolver that can be used to
+This returns the GType of a SoupProxyResolver that can be used to
 resolve HTTP proxies for GNOME applications. You can add this to
 a session using soup_session_add_feature_by_type() or by using the
 SOUP_SESSION_ADD_FEATURE_BY_TYPE construct-time property.
diff -Nru libsoup2.4-2.30.1/docs/reference/html/libsoup-2.4-SoupMessageBody.html libsoup2.4-2.30.2/docs/reference/html/libsoup-2.4-SoupMessageBody.html
--- libsoup2.4-2.30.1/docs/reference/html/libsoup-2.4-SoupMessageBody.html	2010-04-26 21:56:18.000000000 +0100
+++ libsoup2.4-2.30.2/docs/reference/html/libsoup-2.4-SoupMessageBody.html	2010-06-22 18:08:01.000000000 +0100
@@ -43,16 +43,16 @@
                     SoupBuffer;
 enum                SoupMemoryUse;
 SoupBuffer *        soup_buffer_new                     (SoupMemoryUse use,
-                                                         gconstpointer data,
-                                                         gsize length);
+                                                         gconstpointer data,
+                                                         gsize length);
 SoupBuffer *        soup_buffer_new_subbuffer           (SoupBuffer *parent,
-                                                         gsize offset,
-                                                         gsize length);
-SoupBuffer *        soup_buffer_new_with_owner          (gconstpointer data,
-                                                         gsize length,
-                                                         gpointer owner,
-                                                         GDestroyNotify owner_dnotify);
-gpointer            soup_buffer_get_owner               (SoupBuffer *buffer);
+                                                         gsize offset,
+                                                         gsize length);
+SoupBuffer *        soup_buffer_new_with_owner          (gconstpointer data,
+                                                         gsize length,
+                                                         gpointer owner,
+                                                         GDestroyNotify owner_dnotify);
+gpointer            soup_buffer_get_owner               (SoupBuffer *buffer);
 SoupBuffer *        soup_buffer_copy                    (SoupBuffer *buffer);
 void                soup_buffer_free                    (SoupBuffer *buffer);
 
@@ -61,20 +61,20 @@
 void                soup_message_body_free              (SoupMessageBody *body);
 
 void                soup_message_body_set_accumulate    (SoupMessageBody *body,
-                                                         gboolean accumulate);
-gboolean            soup_message_body_get_accumulate    (SoupMessageBody *body);
+                                                         gboolean accumulate);
+gboolean            soup_message_body_get_accumulate    (SoupMessageBody *body);
 
 void                soup_message_body_append            (SoupMessageBody *body,
                                                          SoupMemoryUse use,
-                                                         gconstpointer data,
-                                                         gsize length);
+                                                         gconstpointer data,
+                                                         gsize length);
 void                soup_message_body_append_buffer     (SoupMessageBody *body,
                                                          SoupBuffer *buffer);
 void                soup_message_body_truncate          (SoupMessageBody *body);
 void                soup_message_body_complete          (SoupMessageBody *body);
 SoupBuffer *        soup_message_body_flatten           (SoupMessageBody *body);
 SoupBuffer *        soup_message_body_get_chunk         (SoupMessageBody *body,
-                                                         goffset offset);
+                                                         goffset offset);
 
 void                soup_message_body_got_chunk         (SoupMessageBody *body,
                                                          SoupBuffer *chunk);
@@ -111,7 +111,7 @@
 

 

 data is a char because that's generally convenient; in some
-situations you may need to cast it to guchar or another type.
+situations you may need to cast it to guchar or another type.
 

 
@@ -122,7 +122,7 @@
 
-
+
@@ -161,7 +161,7 @@
 
@@ -187,8 +187,8 @@
 

 
soup_buffer_new ()

 
SoupBuffer *        soup_buffer_new                     (SoupMemoryUse use,
-                                                         gconstpointer data,
-                                                         gsize length);

+                                                         gconstpointer data,
+                                                         gsize length);
 

 Creates a new SoupBuffer containing length bytes from data.
 

@@ -222,8 +222,8 @@
 

 
soup_buffer_new_subbuffer ()

 
SoupBuffer *        soup_buffer_new_subbuffer           (SoupBuffer *parent,
-                                                         gsize offset,
-                                                         gsize length);

+                                                         gsize offset,
+                                                         gsize length);
 

 Creates a new SoupBuffer containing length bytes "copied" from
 parent starting at offset. (Normally this will not actually copy
@@ -259,10 +259,10 @@
 

 

 
soup_buffer_new_with_owner ()

-
SoupBuffer *        soup_buffer_new_with_owner          (gconstpointer data,
-                                                         gsize length,
-                                                         gpointer owner,
-                                                         GDestroyNotify owner_dnotify);

+
SoupBuffer *        soup_buffer_new_with_owner          (gconstpointer data,
+                                                         gsize length,
+                                                         gpointer owner,
+                                                         GDestroyNotify owner_dnotify);

 

 Creates a new SoupBuffer containing length bytes from data. When
 the SoupBuffer is freed, it will call owner_dnotify, passing
@@ -284,7 +284,7 @@
 3
         

+                                   (GDestroyNotify)xmlFree);

 

 
 
gsize length;
gsize length;

 length of data
 
 
SOUP_MEMORY_TAKE

 The caller has allocated the memory for the
 SoupBuffer's use; libsoup will assume ownership of it and free it
-(with g_free()) when it is done with it.
+(with g_free()) when it is done with it.
 
 

 
xmlDocDumpMemory (doc, &xmlbody, &len);
 return soup_buffer_new_with_owner (xmlbody, len, xmlbody,
-                                   (GDestroyNotify)xmlFree);

       

     
   

@@ -332,7 +332,7 @@
 

 

 
soup_buffer_get_owner ()

-
gpointer            soup_buffer_get_owner               (SoupBuffer *buffer);

+
gpointer            soup_buffer_get_owner               (SoupBuffer *buffer);

 

 Gets the "owner" object for a buffer created with
 soup_buffer_new_with_owner().
@@ -412,7 +412,7 @@
 

 

 Note that while length always reflects the full length of the
-message body, data is normally NULL, and will only be filled in
+message body, data is normally NULL, and will only be filled in
 after soup_message_body_flatten() is called. For client-side
 messages, this automatically happens for the response body after it
 has been fully read, unless you set the
@@ -433,7 +433,7 @@
 

 

 
goffset length;
goffset length;

 length of data
 
 

 
data :
 data to append. [array length=length][element-type uint8]
+data to append
 
 

 

 

 
Returns :
 a SoupBuffer, or NULL.
+ a SoupBuffer, or NULL.
 
 

 
 
 

 
Returns :
 the header's value or NULL if not found.
+ the header's value or NULL if not found.
 
 
 

 

 
Returns :
 the header's value or NULL if not found.
+ the header's value or NULL if not found.
 
 
 

 
 
 
 
 

 
iter :
 a pointer to a SoupMessageHeadersIter
-structure. [out][transfer none]
+a pointer to a SoupMessageHeadersIter structure
 
 

 

 

@@ -599,24 +598,22 @@
 
-
-
-
-
@@ -732,7 +729,7 @@
 

 
soup_message_headers_get_content_length ()

-
goffset             soup_message_headers_get_content_length
+
goffset             soup_message_headers_get_content_length
                                                         (SoupMessageHeaders *hdrs);

 

 Gets the message body length that hdrs declare. This will only
@@ -760,7 +757,7 @@
 
soup_message_headers_set_content_length ()

 
void                soup_message_headers_set_content_length
                                                         (SoupMessageHeaders *hdrs,
-                                                         goffset content_length);

+                                                         goffset content_length);

 

 Sets the message body length that hdrs will declare, and sets
 hdrs's encoding to SOUP_ENCODING_CONTENT_LENGTH.
@@ -884,10 +881,10 @@
 
soup_message_headers_get_content_type ()

 
const char *        soup_message_headers_get_content_type
                                                         (SoupMessageHeaders *hdrs,
-                                                         GHashTable **params);

+                                                         GHashTable **params);
 

 Looks up the "Content-Type" header in hdrs, parses it, and returns
-its value in *content_type and *params. params can be NULL if you
+its value in *content_type and *params. params can be NULL if you
 are only interested in the content type itself.
 

 

 

 
iter :
 a SoupMessageHeadersIter. [inout][transfer none]
+a SoupMessageHeadersIter
 
 

 

 
name :
 pointer to a variable to return
-the header name in. [out][transfer none]
+pointer to a variable to return the header name in
 
 

 

 
value :
 pointer to a variable to return
-the header value in. [out][transfer none]
+pointer to a variable to return the header value in
 
 

 

 
Returns :
 TRUE if another name and value were returned, FALSE
+ TRUE if another name and value were returned, FALSE
 if the end of the headers has been reached.
 
 

 

@@ -901,7 +898,7 @@
 
@@ -922,7 +919,7 @@
 
void                soup_message_headers_set_content_type
                                                         (SoupMessageHeaders *hdrs,
                                                          const char *content_type,
-                                                         GHashTable *params);

+                                                         GHashTable *params);

 Sets the "Content-Type" header in hdrs to content_type,
 optionally with additional parameters specified in params.
@@ -942,7 +939,7 @@
 

-
@@ -952,14 +949,14 @@
 

 
soup_message_headers_get_content_disposition ()

-
gboolean            soup_message_headers_get_content_disposition
+
gboolean            soup_message_headers_get_content_disposition
                                                         (SoupMessageHeaders *hdrs,
                                                          char **disposition,
-                                                         GHashTable **params);

+                                                         GHashTable **params);

 

 Looks up the "Content-Disposition" header in hdrs, parses it, and
 returns its value in *disposition and *params. params can be
-NULL if you are only interested in the disposition-type.
+NULL if you are only interested in the disposition-type.
 

 

 In HTTP, the most common use of this header is to set a
@@ -986,19 +983,19 @@
 
 

-
-
@@ -1013,7 +1010,7 @@
 
void                soup_message_headers_set_content_disposition
                                                         (SoupMessageHeaders *hdrs,
                                                          const char *disposition,
-                                                         GHashTable *params);

+                                                         GHashTable *params);

 Sets the "Content-Disposition" header in hdrs to disposition,
 optionally with additional parameters specified in params.
@@ -1037,7 +1034,7 @@
 

-
@@ -1075,12 +1072,12 @@
 
-
+
-
+
@@ -1091,8 +1088,8 @@
 

 
soup_message_headers_get_ranges ()

-
gboolean            soup_message_headers_get_ranges     (SoupMessageHeaders *hdrs,
-                                                         goffset total_length,
+
gboolean            soup_message_headers_get_ranges     (SoupMessageHeaders *hdrs,
+                                                         goffset total_length,
                                                          SoupRange **ranges,
                                                          int *length);

 

@@ -1133,8 +1130,8 @@
 
 

-
@@ -1180,8 +1177,8 @@
 

 
soup_message_headers_set_range ()

 
void                soup_message_headers_set_range      (SoupMessageHeaders *hdrs,
-                                                         goffset start,
-                                                         goffset end);

+                                                         goffset start,
+                                                         goffset end);
 

 Sets hdrs's Range header to request the indicated range.
 start and end are interpreted as in a SoupRange.
@@ -1240,11 +1237,11 @@
 

 

 
soup_message_headers_get_content_range ()

-
gboolean            soup_message_headers_get_content_range
+
gboolean            soup_message_headers_get_content_range
                                                         (SoupMessageHeaders *hdrs,
-                                                         goffset *start,
-                                                         goffset *end,
-                                                         goffset *total_length);

+                                                         goffset *start,
+                                                         goffset *end,
+                                                         goffset *total_length);

 

 Parses hdrs's Content-Range header and returns it in start,
 end, and total_length. If the total length field in the header
@@ -1271,13 +1268,13 @@
 

-
@@ -1290,9 +1287,9 @@
 
soup_message_headers_set_content_range ()
void                soup_message_headers_set_content_range
                                                         (SoupMessageHeaders *hdrs,
-                                                         goffset start,
-                                                         goffset end,
-                                                         goffset total_length);

+                                                         goffset start,
+                                                         goffset end,
+                                                         goffset total_length);

 Sets hdrs's Content-Range header according to the given values.
 (Note that total_length is the total length of the entire resource
diff -Nru libsoup2.4-2.30.1/docs/reference/html/libsoup-2.4-Soup-Miscellaneous-Utilities.html libsoup2.4-2.30.2/docs/reference/html/libsoup-2.4-Soup-Miscellaneous-Utilities.html
--- libsoup2.4-2.30.1/docs/reference/html/libsoup-2.4-Soup-Miscellaneous-Utilities.html	2010-04-26 21:56:18.000000000 +0100
+++ libsoup2.4-2.30.2/docs/reference/html/libsoup-2.4-Soup-Miscellaneous-Utilities.html	2010-06-22 18:08:01.000000000 +0100
@@ -55,62 +55,62 @@
                                                          SoupDateFormat format);
 time_t              soup_date_to_time_t                 (SoupDate *date);
 void                soup_date_to_timeval                (SoupDate *date,
-                                                         GTimeVal *time);
-gboolean            soup_date_is_past                   (SoupDate *date);
+                                                         GTimeVal *time);
+gboolean            soup_date_is_past                   (SoupDate *date);
 void                soup_date_free                      (SoupDate *date);
 
-guint               soup_headers_parse_request          (const char *str,
+guint               soup_headers_parse_request          (const char *str,
                                                          int len,
                                                          SoupMessageHeaders *req_headers,
                                                          char **req_method,
                                                          char **req_path,
                                                          SoupHTTPVersion *ver);
-gboolean            soup_headers_parse_response         (const char *str,
+gboolean            soup_headers_parse_response         (const char *str,
                                                          int len,
                                                          SoupMessageHeaders *headers,
                                                          SoupHTTPVersion *ver,
-                                                         guint *status_code,
+                                                         guint *status_code,
                                                          char **reason_phrase);
-gboolean            soup_headers_parse_status_line      (const char *status_line,
+gboolean            soup_headers_parse_status_line      (const char *status_line,
                                                          SoupHTTPVersion *ver,
-                                                         guint *status_code,
+                                                         guint *status_code,
                                                          char **reason_phrase);
-gboolean            soup_headers_parse                  (const char *str,
+gboolean            soup_headers_parse                  (const char *str,
                                                          int len,
                                                          SoupMessageHeaders *dest);
 
-GSList *            soup_header_parse_list              (const char *header);
-GSList *            soup_header_parse_quality_list      (const char *header,
-                                                         GSList **unacceptable);
-void                soup_header_free_list               (GSList *list);
-gboolean            soup_header_contains                (const char *header,
+GSList *            soup_header_parse_list              (const char *header);
+GSList *            soup_header_parse_quality_list      (const char *header,
+                                                         GSList **unacceptable);
+void                soup_header_free_list               (GSList *list);
+gboolean            soup_header_contains                (const char *header,
                                                          const char *token);
-GHashTable *        soup_header_parse_param_list        (const char *header);
-GHashTable *        soup_header_parse_semi_param_list   (const char *header);
-void                soup_header_free_param_list         (GHashTable *param_list);
-void                soup_header_g_string_append_param   (GString *string,
+GHashTable *        soup_header_parse_param_list        (const char *header);
+GHashTable *        soup_header_parse_semi_param_list   (const char *header);
+void                soup_header_free_param_list         (GHashTable *param_list);
+void                soup_header_g_string_append_param   (GString *string,
                                                          const char *name,
                                                          const char *value);
 
-gboolean            soup_str_case_equal                 (gconstpointer v1,
-                                                         gconstpointer v2);
-guint               soup_str_case_hash                  (gconstpointer key);
+gboolean            soup_str_case_equal                 (gconstpointer v1,
+                                                         gconstpointer v2);
+guint               soup_str_case_hash                  (gconstpointer key);
 
-GSource *           soup_add_completion                 (GMainContext *async_context,
-                                                         GSourceFunc function,
-                                                         gpointer data);
-GSource *           soup_add_idle                       (GMainContext *async_context,
-                                                         GSourceFunc function,
-                                                         gpointer data);
-GSource *           soup_add_io_watch                   (GMainContext *async_context,
-                                                         GIOChannel *chan,
-                                                         GIOCondition condition,
-                                                         GIOFunc function,
-                                                         gpointer data);
-GSource *           soup_add_timeout                    (GMainContext *async_context,
-                                                         guint interval,
-                                                         GSourceFunc function,
-                                                         gpointer data);
+GSource *           soup_add_completion                 (GMainContext *async_context,
+                                                         GSourceFunc function,
+                                                         gpointer data);
+GSource *           soup_add_idle                       (GMainContext *async_context,
+                                                         GSourceFunc function,
+                                                         gpointer data);
+GSource *           soup_add_io_watch                   (GMainContext *async_context,
+                                                         GIOChannel *chan,
+                                                         GIOCondition condition,
+                                                         GIOFunc function,
+                                                         gpointer data);
+GSource *           soup_add_timeout                    (GMainContext *async_context,
+                                                         guint interval,
+                                                         GSourceFunc function,
+                                                         gpointer data);
 
 extern              const gboolean soup_ssl_supported;
 
@@ -137,10 +137,10 @@
 
 

 A date and time. The date is assumed to be in the (proleptic)
-Gregorian calendar. The time is in UTC if utc is TRUE. Otherwise,
+Gregorian calendar. The time is in UTC if utc is TRUE. Otherwise,
 the time is a local time, and offset gives the offset from UTC in
 minutes (such that adding offset to the time would give the
-correct UTC time). If utc is FALSE and offset is 0, then the
+correct UTC time). If utc is FALSE and offset is 0, then the
 SoupDate represents a "floating" time with no associated timezone
 information.
 

@@ -178,9 +178,9 @@
 
-
+
@@ -337,7 +337,7 @@
 
-
@@ -453,9 +453,9 @@
 

 
soup_date_to_timeval ()

 
void                soup_date_to_timeval                (SoupDate *date,
-                                                         GTimeVal *time);

+                                                         GTimeVal *time);
 

-Converts date to a GTimeVal.
+Converts date to a GTimeVal.
 

 

 
params :

 return location for the Content-Type parameters (eg,
-"charset"), or NULL
+"charset"), or NULL
 
 

 

 

 

 
params :
additional parameters, or NULL
+additional parameters, or NULL
 
 

 
 

 
disposition :
return location for the disposition-type, or NULL
+return location for the disposition-type, or NULL
 
 

 

 
params :

 return location for the Content-Disposition parameters, or
-NULL
+NULL
 
 

 

 
Returns :
 TRUE if hdrs contains a "Content-Disposition"
-header, FALSE if not (in which case *disposition and *params
+ TRUE if hdrs contains a "Content-Disposition"
+header, FALSE if not (in which case *disposition and *params
 will be unchanged).
 
 
 

 

 
params :
additional parameters, or NULL
+additional parameters, or NULL
 
 

 
 
 
goffset start;
goffset start;

 the start of the range
 
 

 
goffset end;
goffset end;

 the end of the range
 
 

 

 
Returns :
 TRUE if hdrs contained a "Range" header containing
-byte ranges which could be parsed, FALSE otherwise (in which case
+ TRUE if hdrs contained a "Range" header containing
+byte ranges which could be parsed, FALSE otherwise (in which case
 range and length will not be set).
 
 

 
total_length :

 return value for the total length of the resource,
-or NULL if you don't care.
+or NULL if you don't care.
 
 

 

 
Returns :
 TRUE if hdrs contained a "Content-Range" header
-containing a byte range which could be parsed, FALSE otherwise.
+ TRUE if hdrs contained a "Content-Range" header
+containing a byte range which could be parsed, FALSE otherwise.
 
 
 

 
 
 
 
gboolean utc;
gboolean utc;

 
-TRUE if the date is in UTC
+TRUE if the date is in UTC
 
 

 

 

 
Returns :
 a new SoupDate, or NULL if date_string could not
+ a new SoupDate, or NULL if date_string could not
 be parsed.
 
 
@@ -467,7 +467,7 @@
 
-
@@ -477,7 +477,7 @@
 

 
soup_date_is_past ()

-
gboolean            soup_date_is_past                   (SoupDate *date);

+
gboolean            soup_date_is_past                   (SoupDate *date);

 

 Determines if date is in the past.
 

@@ -491,7 +491,7 @@
 
 

-
@@ -518,7 +518,7 @@
 

 
soup_headers_parse_request ()

-
guint               soup_headers_parse_request          (const char *str,
+
guint               soup_headers_parse_request          (const char *str,
                                                          int len,
                                                          SoupMessageHeaders *req_headers,
                                                          char **req_method,
@@ -552,20 +552,17 @@
 
 

-
-
-
@@ -580,11 +577,11 @@
 

 
soup_headers_parse_response ()

-
gboolean            soup_headers_parse_response         (const char *str,
+
gboolean            soup_headers_parse_response         (const char *str,
                                                          int len,
                                                          SoupMessageHeaders *headers,
                                                          SoupHTTPVersion *ver,
-                                                         guint *status_code,
+                                                         guint *status_code,
                                                          char **reason_phrase);

 

 Parses the headers of an HTTP response in str and stores the
@@ -614,20 +611,18 @@
 

-
-
-
@@ -641,9 +636,9 @@
 

 
soup_headers_parse_status_line ()

-
gboolean            soup_headers_parse_status_line      (const char *status_line,
+
gboolean            soup_headers_parse_status_line      (const char *status_line,
                                                          SoupHTTPVersion *ver,
-                                                         guint *status_code,
+                                                         guint *status_code,
                                                          char **reason_phrase);

 

 Parses the HTTP Status-Line string in status_line into ver,
@@ -660,25 +655,23 @@
 

-
-
-
-
@@ -687,7 +680,7 @@
 

 
soup_headers_parse ()

-
gboolean            soup_headers_parse                  (const char *str,
+
gboolean            soup_headers_parse                  (const char *str,
                                                          int len,
                                                          SoupMessageHeaders *dest);

 

@@ -732,7 +725,7 @@
 

 

 
soup_header_parse_list ()

-
GSList *            soup_header_parse_list              (const char *header);

+
GSList *            soup_header_parse_list              (const char *header);

 

 Parses a header whose content is described by RFC2616 as
 "something", where "something" does not itself contain commas,
@@ -748,7 +741,7 @@
 
 

-
@@ -757,15 +750,15 @@
 

 
soup_header_parse_quality_list ()

-
GSList *            soup_header_parse_quality_list      (const char *header,
-                                                         GSList **unacceptable);

+
GSList *            soup_header_parse_quality_list      (const char *header,
+                                                         GSList **unacceptable);

 

 Parses a header whose content is a list of items with optional
 "qvalue"s (eg, Accept, Accept-Charset, Accept-Encoding,
 Accept-Language, TE).
 

 

-If unacceptable is not NULL, then on return, it will contain the
+If unacceptable is not NULL, then on return, it will contain the
 items with qvalue 0. Either way, those items will be removed from
 the main list.
 

@@ -779,13 +772,13 @@
 
 

-
-
@@ -795,7 +788,7 @@
 

 
soup_header_free_list ()

-
void                soup_header_free_list               (GSList *list);

+
void                soup_header_free_list               (GSList *list);

 

 Frees list.
 

@@ -803,7 +796,7 @@
 

-
@@ -812,7 +805,7 @@
 

 
soup_header_contains ()

-
gboolean            soup_header_contains                (const char *header,
+
gboolean            soup_header_contains                (const char *header,
                                                          const char *token);

 

 Parses header to see if it contains the token token (matched
@@ -844,14 +837,14 @@
 

 

 
soup_header_parse_param_list ()

-
GHashTable *        soup_header_parse_param_list        (const char *header);

+
GHashTable *        soup_header_parse_param_list        (const char *header);

 

 Parses a header which is a comma-delimited list of something like:
 token [ "=" ( token | quoted-string ) ].
 

 

 Tokens that don't have an associated value will still be added to
-the resulting hash table, but with a NULL value.
+the resulting hash table, but with a NULL value.
 

 

 This also handles RFC2231 encoding (which in HTTP is mostly used
@@ -868,7 +861,7 @@
 
 

-
@@ -878,14 +871,14 @@
 

 
soup_header_parse_semi_param_list ()

-
GHashTable *        soup_header_parse_semi_param_list   (const char *header);

+
GHashTable *        soup_header_parse_semi_param_list   (const char *header);

 

 Parses a header which is a semicolon-delimited list of something
 like: token [ "=" ( token | quoted-string ) ].
 

 

 Tokens that don't have an associated value will still be added to
-the resulting hash table, but with a NULL value.
+the resulting hash table, but with a NULL value.
 

 

 This also handles RFC2231 encoding (which in HTTP is mostly used
@@ -902,7 +895,7 @@
 
 

-
@@ -914,7 +907,7 @@
 

 
soup_header_free_param_list ()

-
void                soup_header_free_param_list         (GHashTable *param_list);

+
void                soup_header_free_param_list         (GHashTable *param_list);

 

 Frees param_list.
 

@@ -922,7 +915,7 @@
 

-
@@ -931,7 +924,7 @@
 

 
soup_header_g_string_append_param ()

-
void                soup_header_g_string_append_param   (GString *string,
+
void                soup_header_g_string_append_param   (GString *string,
                                                          const char *name,
                                                          const char *value);

 

@@ -947,14 +940,14 @@
 "filename" parameter.
 

 

-If value is NULL, this will just append name to string.
+If value is NULL, this will just append name to string.
 

 

 

 

 
time :
 a GTimeVal structure in which to store the converted time.. [out]
+a GTimeVal structure in which to store the converted time.
 
 

 
 

 
Returns :
 TRUE if date is in the past
+ TRUE if date is in the past
 
 
 

 

 
req_method :
 if non-NULL, will be filled in with the
-request method. [out][allow-none]
+if non-NULL, will be filled in with the request method
 
 

 

 
req_path :
 if non-NULL, will be filled in with the
-request path. [out][allow-none]
+if non-NULL, will be filled in with the request path
 
 

 

 
ver :
 if non-NULL, will be filled in with the HTTP
-version. [out][allow-none]
+if non-NULL, will be filled in with the HTTP version
 
 

 

 

 

 
ver :
 if non-NULL, will be filled in with the HTTP
-version. [out][allow-none]
+if non-NULL, will be filled in with the HTTP version
 
 

 

 
status_code :
 if non-NULL, will be filled in with
-the status code. [out][allow-none]
+if non-NULL, will be filled in with the status code
 
 

 

 
reason_phrase :
 if non-NULL, will be filled in with
-the reason phrase. [out][allow-none]
+if non-NULL, will be filled in with the reason
+phrase
 
 

 

 

 

 
ver :
 if non-NULL, will be filled in with the HTTP
-version. [out][allow-none]
+if non-NULL, will be filled in with the HTTP version
 
 

 

 
status_code :
 if non-NULL, will be filled in with
-the status code. [out][allow-none]
+if non-NULL, will be filled in with the status code
 
 

 

 
reason_phrase :
 if non-NULL, will be filled in with
-the reason phrase. [out][allow-none]
+if non-NULL, will be filled in with the reason
+phrase
 
 

 

 
Returns :
 TRUE if status_line was parsed successfully.
+ TRUE if status_line was parsed successfully.
 
 

 
 

 
Returns :
 a GSList of list elements, as allocated strings
+ a GSList of list elements, as allocated strings
 
 

 
 

 
unacceptable :
 on return, will contain a list of
-unacceptable values. [out][allow-none]
+on return, will contain a list of unacceptable
+values
 
 

 

 
Returns :
 a GSList of acceptable values (as allocated
+ a GSList of acceptable values (as allocated
 strings), highest-qvalue first.
 
 

 
 

 
list :
a GSList returned from soup_header_parse_list() or
+a GSList returned from soup_header_parse_list() or
 soup_header_parse_quality_list()
 
 

 

 
Returns :
 a GHashTable of list elements, which can be freed
+ a GHashTable of list elements, which can be freed
 with soup_header_free_param_list().
 
 

 

 
Returns :
 a GHashTable of list elements, which can be freed
+ a GHashTable of list elements, which can be freed
 with soup_header_free_param_list().
 
 
 

 

 
param_list :
a GHashTable returned from soup_header_parse_param_list()
+a GHashTable returned from soup_header_parse_param_list()
 or soup_header_parse_semi_param_list()
 
 

 

-
@@ -964,7 +957,7 @@
 
-
@@ -974,8 +967,8 @@
 

 
soup_str_case_equal ()

-
gboolean            soup_str_case_equal                 (gconstpointer v1,
-                                                         gconstpointer v2);

+
gboolean            soup_str_case_equal                 (gconstpointer v1,
+                                                         gconstpointer v2);

 

 Compares v1 and v2 in a case-insensitive manner
 

@@ -994,7 +987,7 @@
 
 

-
@@ -1003,7 +996,7 @@
 

 
soup_str_case_hash ()

-
guint               soup_str_case_hash                  (gconstpointer key);

+
guint               soup_str_case_hash                  (gconstpointer key);

 

 Hashes key in a case-insensitive manner.
 

@@ -1026,9 +1019,9 @@
 

 

 
soup_add_completion ()

-
GSource *           soup_add_completion                 (GMainContext *async_context,
-                                                         GSourceFunc function,
-                                                         gpointer data);

+
GSource *           soup_add_completion                 (GMainContext *async_context,
+                                                         GSourceFunc function,
+                                                         gpointer data);

 

 Adds function to be executed from inside async_context with the
 default priority. Use this when you want to complete an action in
@@ -1039,8 +1032,8 @@
 

-
@@ -1055,8 +1048,8 @@
 
-
@@ -1067,25 +1060,25 @@
 

 
soup_add_idle ()

-
GSource *           soup_add_idle                       (GMainContext *async_context,
-                                                         GSourceFunc function,
-                                                         gpointer data);

+
GSource *           soup_add_idle                       (GMainContext *async_context,
+                                                         GSourceFunc function,
+                                                         gpointer data);

 

-Adds an idle event as with g_idle_add(), but using the given
+Adds an idle event as with g_idle_add(), but using the given
 async_context.
 

 

 If you want function to run "right away", use
 soup_add_completion(), since that sets a higher priority on the
-GSource than soup_add_idle() does.
+GSource than soup_add_idle() does.
 

 

 
 
 

 
string :
a GString being used to construct an HTTP header value
+a GString being used to construct an HTTP header value
 
 

 

 

 
value :
a parameter value, or NULL
+a parameter value, or NULL
 
 

 
 

 
Returns :
 TRUE if they are equal (modulo case)
+ TRUE if they are equal (modulo case)
 
 

 
 
 

 
async_context :
the GMainContext to dispatch the idle event in, or
-NULL for the default context
+the GMainContext to dispatch the idle event in, or
+NULL for the default context
 
 

 

 

 
Returns :
 a GSource, which can be removed from async_context
-with g_source_destroy().
+ a GSource, which can be removed from async_context
+with g_source_destroy().
 
 
 

 

-
@@ -1100,8 +1093,8 @@
 
-
@@ -1110,13 +1103,13 @@
 

 
soup_add_io_watch ()

-
GSource *           soup_add_io_watch                   (GMainContext *async_context,
-                                                         GIOChannel *chan,
-                                                         GIOCondition condition,
-                                                         GIOFunc function,
-                                                         gpointer data);

+
GSource *           soup_add_io_watch                   (GMainContext *async_context,
+                                                         GIOChannel *chan,
+                                                         GIOCondition condition,
+                                                         GIOFunc function,
+                                                         gpointer data);

 

-Adds an I/O watch as with g_io_add_watch(), but using the given
+Adds an I/O watch as with g_io_add_watch(), but using the given
 async_context.
 

 

 
 
 

 
async_context :
the GMainContext to dispatch the idle event in, or
-NULL for the default context
+the GMainContext to dispatch the idle event in, or
+NULL for the default context
 
 

 

 

 
Returns :
 a GSource, which can be removed from async_context
-with g_source_destroy().
+ a GSource, which can be removed from async_context
+with g_source_destroy().
 
 

 
 

@@ -1124,13 +1117,13 @@
 
-
-
@@ -1150,8 +1143,8 @@
 
-
@@ -1160,12 +1153,12 @@
 

 
soup_add_timeout ()

-
GSource *           soup_add_timeout                    (GMainContext *async_context,
-                                                         guint interval,
-                                                         GSourceFunc function,
-                                                         gpointer data);

+
GSource *           soup_add_timeout                    (GMainContext *async_context,
+                                                         guint interval,
+                                                         GSourceFunc function,
+                                                         gpointer data);

 

-Adds a timeout as with g_timeout_add(), but using the given
+Adds a timeout as with g_timeout_add(), but using the given
 async_context.
 

 

 

 
async_context :
the GMainContext to dispatch the I/O watch in, or
-NULL for the default context
+the GMainContext to dispatch the I/O watch in, or
+NULL for the default context
 
 

 

 
chan :
the GIOChannel to watch
+the GIOChannel to watch
 
 

 

 

 
Returns :
 a GSource, which can be removed from async_context
-with g_source_destroy().
+ a GSource, which can be removed from async_context
+with g_source_destroy().
 
 

 
 

@@ -1173,8 +1166,8 @@
 
-
@@ -1194,8 +1187,8 @@
 
-
diff -Nru libsoup2.4-2.30.1/docs/reference/html/libsoup-2.4-SoupMultipart.html libsoup2.4-2.30.2/docs/reference/html/libsoup-2.4-SoupMultipart.html
--- libsoup2.4-2.30.1/docs/reference/html/libsoup-2.4-SoupMultipart.html	2010-04-26 21:56:18.000000000 +0100
+++ libsoup2.4-2.30.2/docs/reference/html/libsoup-2.4-SoupMultipart.html	2010-06-22 18:08:00.000000000 +0100
@@ -47,7 +47,7 @@
 voidsoup_multipart_free                 (SoupMultipart *multipart);
 
 intsoup_multipart_get_length           (SoupMultipart *multipart);
-gbooleansoup_multipart_get_part             (SoupMultipart *multipart,
+gbooleansoup_multipart_get_part             (SoupMultipart *multipart,
                                                          int part,
                                                          SoupMessageHeaders **headers,
                                                          SoupBuffer **body);
@@ -142,7 +142,7 @@
 
-
@@ -196,7 +196,7 @@
 

 
soup_multipart_get_part ()

-
gboolean            soup_multipart_get_part             (SoupMultipart *multipart,
+
gboolean            soup_multipart_get_part             (SoupMultipart *multipart,
                                                          int part,
                                                          SoupMessageHeaders **headers,
                                                          SoupBuffer **body);

@@ -228,7 +228,7 @@
 

-
@@ -334,12 +334,12 @@
 
-
-
diff -Nru libsoup2.4-2.30.1/docs/reference/html/libsoup-2.4-soup-status.html libsoup2.4-2.30.2/docs/reference/html/libsoup-2.4-soup-status.html
--- libsoup2.4-2.30.1/docs/reference/html/libsoup-2.4-soup-status.html	2010-04-26 21:56:18.000000000 +0100
+++ libsoup2.4-2.30.2/docs/reference/html/libsoup-2.4-soup-status.html	2010-06-22 18:08:01.000000000 +0100
@@ -47,8 +47,8 @@
 #define             SOUP_STATUS_IS_CLIENT_ERROR         (status)
 #define             SOUP_STATUS_IS_SERVER_ERROR         (status)
 enum                SoupKnownStatusCode;
-const char *        soup_status_get_phrase              (guint status_code);
-guintsoup_status_proxify                 (guint status_code);
+const char *        soup_status_get_phrase              (guint status_code);
+guintsoup_status_proxify                 (guint status_code);
 
 #define             SOUP_HTTP_ERROR
@@ -75,7 +75,7 @@
 
-
@@ -99,7 +99,7 @@
 
-
@@ -123,7 +123,7 @@
 
-
@@ -147,7 +147,7 @@
 
-
@@ -171,7 +171,7 @@
 
-
@@ -195,7 +195,7 @@
 
-
@@ -217,6 +217,7 @@
 	SOUP_STATUS_IO_ERROR,
 	SOUP_STATUS_MALFORMED,
 	SOUP_STATUS_TRY_AGAIN,
+	SOUP_STATUS_TOO_MANY_REDIRECTS,
 
 	/* HTTP Status Codes */
 	SOUP_STATUS_CONTINUE                        = 100,
@@ -336,6 +337,11 @@
 
+
+
+
+
@@ -609,7 +615,7 @@
 

 
soup_status_get_phrase ()

-
const char *        soup_status_get_phrase              (guint status_code);

+
const char *        soup_status_get_phrase              (guint status_code);

 

 Looks up the stock HTTP description of status_code. This is used
 by soup_message_set_status() to get the correct text to go with a
@@ -645,7 +651,7 @@
 

 

 
soup_status_proxify ()

-
guint               soup_status_proxify                 (guint status_code);

+
guint               soup_status_proxify                 (guint status_code);

 

 Turns SOUP_STATUS_CANT_RESOLVE into
 SOUP_STATUS_CANT_RESOLVE_PROXY and SOUP_STATUS_CANT_CONNECT into
@@ -676,7 +682,7 @@
 
#define SOUP_HTTP_ERROR soup_http_error_quark()
 

 

-A GError domain representing an HTTP status. Use a
+A GError domain representing an HTTP status. Use a
 SoupKnownStatusCode for the code
 value.
 

diff -Nru libsoup2.4-2.30.1/docs/reference/html/libsoup-2.4-SoupURI.html libsoup2.4-2.30.2/docs/reference/html/libsoup-2.4-SoupURI.html
--- libsoup2.4-2.30.1/docs/reference/html/libsoup-2.4-SoupURI.html	2010-04-26 21:56:18.000000000 +0100
+++ libsoup2.4-2.30.2/docs/reference/html/libsoup-2.4-SoupURI.html	2010-06-22 18:08:01.000000000 +0100
@@ -45,10 +45,10 @@
                                                          const char *uri_string);
 SoupURI *           soup_uri_new                        (const char *uri_string);
 char *              soup_uri_to_string                  (SoupURI *uri,
-                                                         gboolean just_path_and_query);
+                                                         gboolean just_path_and_query);
 
 SoupURI *           soup_uri_copy                       (SoupURI *uri);
-gboolean            soup_uri_equal                      (SoupURI *uri1,
+gboolean            soup_uri_equal                      (SoupURI *uri1,
                                                          SoupURI *uri2);
 void                soup_uri_free                       (SoupURI *uri);
 
@@ -60,7 +60,7 @@
 
 #define             SOUP_URI_SCHEME_HTTP
 #define             SOUP_URI_SCHEME_HTTPS
-gboolean            soup_uri_uses_default_port          (SoupURI *uri);
+gboolean            soup_uri_uses_default_port          (SoupURI *uri);
 #define             SOUP_URI_VALID_FOR_HTTP             (uri)
 
 void                soup_uri_set_scheme                 (SoupURI *uri,
@@ -72,13 +72,13 @@
 void                soup_uri_set_host                   (SoupURI *uri,
                                                          const char *host);
 void                soup_uri_set_port                   (SoupURI *uri,
-                                                         guint port);
+                                                         guint port);
 void                soup_uri_set_path                   (SoupURI *uri,
                                                          const char *path);
 void                soup_uri_set_query                  (SoupURI *uri,
                                                          const char *query);
 void                soup_uri_set_query_from_form        (SoupURI *uri,
-                                                         GHashTable *form);
+                                                         GHashTable *form);
 void                soup_uri_set_query_from_fields      (SoupURI *uri,
                                                          const char *first_field,
                                                          ...);
@@ -141,15 +141,15 @@
 

 

 host contains the hostname, and port the port specified in the
-URI. If the URI doesn't contain a hostname, host will be NULL,
+URI. If the URI doesn't contain a hostname, host will be NULL,
 and if it doesn't specify a port, port may be 0. However, for
-"http" and "https" URIs, host is guaranteed to be non-NULL
-(trying to parse an http URI with no host will return NULL), and
+"http" and "https" URIs, host is guaranteed to be non-NULL
+(trying to parse an http URI with no host will return NULL), and
 port will always be non-0 (because libsoup knows the default value
 to use when it is not specified in the URI).
 

 

-path is always non-NULL. For http/https URIs, path will never be
+path is always non-NULL. For http/https URIs, path will never be
 an empty string either; if the input URI has no path, the parsed
 SoupURI will have a path of "/".
 

@@ -176,12 +176,12 @@
 

-
-
@@ -190,7 +190,7 @@
 
-
+
@@ -201,12 +201,12 @@
 
-
-
@@ -249,7 +249,7 @@
 Parses an absolute URI.
 

-You can also pass NULL for uri_string if you want to get back an
+You can also pass NULL for uri_string if you want to get back an
 "empty" SoupURI that you can fill in by hand. (You will need to
 call at least soup_uri_set_scheme() and soup_uri_set_path(), since
 those fields are required.)
@@ -264,7 +264,7 @@
 
 

-
@@ -274,12 +274,12 @@
 

 
soup_uri_to_string ()

 
char *              soup_uri_to_string                  (SoupURI *uri,
-                                                         gboolean just_path_and_query);

+                                                         gboolean just_path_and_query);
 

 Returns a string representing uri.
 

 

-If just_path_and_query is TRUE, this concatenates the path and query
+If just_path_and_query is TRUE, this concatenates the path and query
 together. That is, it constructs the string that would be needed in
 the Request-Line of an HTTP request for uri.
 

@@ -293,7 +293,7 @@
 
 

-
@@ -330,7 +330,7 @@
 

 
soup_uri_equal ()

-
gboolean            soup_uri_equal                      (SoupURI *uri1,
+
gboolean            soup_uri_equal                      (SoupURI *uri1,
                                                          SoupURI *uri2);

 

 Tests whether or not uri1 and uri2 are equal in all parts
@@ -350,7 +350,7 @@
 

-
@@ -392,7 +392,7 @@
 
-
@@ -420,7 +420,7 @@
 
-
@@ -457,12 +457,12 @@
 
-
-
@@ -492,7 +492,7 @@
 

 
soup_uri_uses_default_port ()

-
gboolean            soup_uri_uses_default_port          (SoupURI *uri);

+
gboolean            soup_uri_uses_default_port          (SoupURI *uri);

 

 Tests if uri uses the default port for its scheme. (Eg, 80 for
 http.) (This only works for http and https; libsoup does not know
@@ -508,7 +508,7 @@
 
 

-
@@ -533,7 +533,7 @@
 
-
@@ -584,7 +584,7 @@
 
-
@@ -608,7 +608,7 @@
 
-
@@ -637,7 +637,7 @@
 
-
@@ -647,7 +647,7 @@
 

 
soup_uri_set_port ()

 
void                soup_uri_set_port                   (SoupURI *uri,
-                                                         guint port);

+                                                         guint port);
 

 Sets uri's port to port. If port is 0, uri will not have an
 explicitly-specified port.
@@ -720,7 +720,7 @@
 

 
soup_uri_set_query_from_form ()

 
void                soup_uri_set_query_from_form        (SoupURI *uri,
-                                                         GHashTable *form);

+                                                         GHashTable *form);
 

 Sets uri's query to the result of encoding form according to the
 HTML form rules. See soup_form_encode_hash() for more information.
@@ -735,7 +735,7 @@
 
 

-
@@ -768,7 +768,7 @@
 
diff -Nru libsoup2.4-2.30.1/docs/reference/html/libsoup-2.4-XMLRPC-Support.html libsoup2.4-2.30.2/docs/reference/html/libsoup-2.4-XMLRPC-Support.html
--- libsoup2.4-2.30.1/docs/reference/html/libsoup-2.4-XMLRPC-Support.html	2010-04-26 21:56:18.000000000 +0100
+++ libsoup2.4-2.30.2/docs/reference/html/libsoup-2.4-XMLRPC-Support.html	2010-06-22 18:08:01.000000000 +0100
@@ -41,35 +41,35 @@
 #include <libsoup/soup.h>
 
 char *              soup_xmlrpc_build_method_call       (const char *method_name,
-                                                         GValue *params,
+                                                         GValue *params,
                                                          int n_params);
 SoupMessage *       soup_xmlrpc_request_new             (const char *uri,
                                                          const char *method_name,
                                                          ...);
-gbooleansoup_xmlrpc_parse_method_response   (const char *method_response,
+gbooleansoup_xmlrpc_parse_method_response   (const char *method_response,
                                                          int length,
-                                                         GValue *value,
-                                                         GError **error);
-gbooleansoup_xmlrpc_extract_method_response (const char *method_response,
+                                                         GValue *value,
+                                                         GError **error);
+gbooleansoup_xmlrpc_extract_method_response (const char *method_response,
                                                          int length,
-                                                         GError **error,
-                                                         GType type,
+                                                         GError **error,
+                                                         GType type,
                                                          ...);
 
-gbooleansoup_xmlrpc_parse_method_call       (const char *method_call,
+gbooleansoup_xmlrpc_parse_method_call       (const char *method_call,
                                                          int length,
                                                          char **method_name,
-                                                         GValueArray **params);
-gbooleansoup_xmlrpc_extract_method_call     (const char *method_call,
+                                                         GValueArray **params);
+gbooleansoup_xmlrpc_extract_method_call     (const char *method_call,
                                                          int length,
                                                          char **method_name,
                                                          ...);
-char *              soup_xmlrpc_build_method_response   (GValue *value);
+char *              soup_xmlrpc_build_method_response   (GValue *value);
 char *              soup_xmlrpc_build_fault             (int fault_code,
                                                          const char *fault_format,
                                                          ...);
 voidsoup_xmlrpc_set_response            (SoupMessage *msg,
-                                                         GType type,
+                                                         GType type,
                                                          ...);
 voidsoup_xmlrpc_set_fault               (SoupMessage *msg,
                                                          int fault_code,
@@ -90,7 +90,7 @@
 

 
soup_xmlrpc_build_method_call ()

 
char *              soup_xmlrpc_build_method_call       (const char *method_name,
-                                                         GValue *params,
+                                                         GValue *params,
                                                          int n_params);

 

 This creates an XML-RPC methodCall and returns it as a string.
@@ -98,25 +98,25 @@
 soup_xmlrpc_call() are built on.
 

 

-params is an array of GValue representing the parameters to
-method. (It is *not* a GValueArray, although if you have a
-GValueArray, you can just pass its values and n_values fields.)
+params is an array of GValue representing the parameters to
+method. (It is *not* a GValueArray, although if you have a
+GValueArray, you can just pass its values and n_values fields.)
 

 

 The correspondence between glib types and XML-RPC types is:
 

 

-  int: int (G_TYPE_INT)
-  boolean: gboolean (G_TYPE_BOOLEAN)
-  string: char* (G_TYPE_STRING)
-  double: double (G_TYPE_DOUBLE)
+  int: int (G_TYPE_INT)
+  boolean: gboolean (G_TYPE_BOOLEAN)
+  string: char* (G_TYPE_STRING)
+  double: double (G_TYPE_DOUBLE)
   datetime.iso8601: SoupDate (SOUP_TYPE_DATE)
-  base64: GByteArray (SOUP_TYPE_BYTE_ARRAY)
-  struct: GHashTable (G_TYPE_HASH_TABLE)
-  array: GValueArray (G_TYPE_VALUE_ARRAY)
+  base64: GByteArray (SOUP_TYPE_BYTE_ARRAY)
+  struct: GHashTable (G_TYPE_HASH_TABLE)
+  array: GValueArray (G_TYPE_VALUE_ARRAY)
 

 

-For structs, use a GHashTable that maps strings to GValue;
+For structs, use a GHashTable that maps strings to GValue;
 soup_value_hash_new() and related methods can help with this.
 

 

 

 
async_context :
the GMainContext to dispatch the timeout in, or
-NULL for the default context
+the GMainContext to dispatch the timeout in, or
+NULL for the default context
 
 

 

 

 
Returns :
 a GSource, which can be removed from async_context
-with g_source_destroy().
+ a GSource, which can be removed from async_context
+with g_source_destroy().
 
 

                                                          
 

 
Returns :
 a new SoupMultipart (or NULL if the message couldn't
+ a new SoupMultipart (or NULL if the message couldn't
 be parsed or wasn't multipart).
 
 
 

 

 
Returns :
 TRUE on success, FALSE if part is out of range (in
+ TRUE on success, FALSE if part is out of range (in
 which case headers and body won't be set)
 
 

 

 
filename :
the name of the file, or NULL if not known
+the name of the file, or NULL if not known
 
 

 

 
content_type :
the MIME type of the file, or NULL if not known
+the MIME type of the file, or NULL if not known
 
 

 
                              
 

 

 
Returns :
 TRUE or FALSE
+ TRUE or FALSE
 
 

 
 

 
Returns :
 TRUE or FALSE
+ TRUE or FALSE
 
 

 
 

 
Returns :
 TRUE or FALSE
+ TRUE or FALSE
 
 

 
 

 
Returns :
 TRUE or FALSE
+ TRUE or FALSE
 
 

 
 

 
Returns :
 TRUE or FALSE
+ TRUE or FALSE
 
 

 
 

 
Returns :
 TRUE or FALSE
+ TRUE or FALSE
 
 

 
 
 
SOUP_STATUS_TOO_MANY_REDIRECTS
There were too many redirections
+

 
SOUP_STATUS_CONTINUE

 100 Continue (HTTP)
 
 

 

 
char *user;
a username, or NULL
+a username, or NULL
 
 

 

 
char *password;
a password, or NULL
+a password, or NULL
 
 

 

 

 
guint port;
guint port;

 the port number on host
 
 

 

 
char *query;
a query for path, or NULL
+a query for path, or NULL
 
 

 

 
char *fragment;
a fragment identifier within path, or NULL
+a fragment identifier within path, or NULL
 
 

 
 

 
Returns :
 a SoupURI, or NULL.
+ a SoupURI, or NULL.
 
 

 

 
just_path_and_query :
if TRUE, output just the path and query portions
+if TRUE, output just the path and query portions
 
 

 

 

 

 
Returns :
 TRUE or FALSE
+ TRUE or FALSE
 
 

 
 

 
escape_extra :
additional reserved characters to escape (or NULL)
+additional reserved characters to escape (or NULL)
 
 

 

 

 
Returns :
 the decoded URI part, or NULL if an invalid percent
+ the decoded URI part, or NULL if an invalid percent
 code was encountered.
 
 

 

 
unescape_extra :
reserved characters to unescape (or NULL)
+reserved characters to unescape (or NULL)
 
 

 

 
Returns :
 the normalized URI part, or NULL if an invalid percent
+ the normalized URI part, or NULL if an invalid percent
 code was encountered.
 
 

 

 
Returns :
 TRUE or FALSE
+ TRUE or FALSE
 
 

 
 

 
Returns :
 TRUE if uri is a valid "http" or "https" URI.
+ TRUE if uri is a valid "http" or "https" URI.
 
 
 

 

 
user :
the username, or NULL
+the username, or NULL
 
 

 
 

 
password :
the password, or NULL
+the password, or NULL
 
 

 
 

 
host :
the hostname or IP address, or NULL
+the hostname or IP address, or NULL
 
 

 

 
form :
a GHashTable containing HTML form information
+a GHashTable containing HTML form information
 
 

 

 
... :

 value of first_field, followed by additional field names
-and values, terminated by NULL.
+and values, terminated by NULL.
 
 

                                                                                                                                 

@@ -139,7 +139,7 @@
 
-
@@ -156,9 +156,9 @@
 to send, for that method call.
 

-The parameters are passed as type/value pairs; ie, first a GType,
+The parameters are passed as type/value pairs; ie, first a GType,
 and then a value of the appropriate type, finally terminated by
-G_TYPE_INVALID.
+G_TYPE_INVALID.
 

 

 
Returns :
 the text of the methodCall, or NULL on error
+ the text of the methodCall, or NULL on error
 
 

 
 
 
@@ -190,17 +190,17 @@
 

 
soup_xmlrpc_parse_method_response ()

-
gboolean            soup_xmlrpc_parse_method_response   (const char *method_response,
+
gboolean            soup_xmlrpc_parse_method_response   (const char *method_response,
                                                          int length,
-                                                         GValue *value,
-                                                         GError **error);

+                                                         GValue *value,
+                                                         GError **error);

 

 Parses method_response and returns the return value in value. If
 method_response is a fault, value will be unchanged, and error
 will be set to an error of type SOUP_XMLRPC_FAULT, with the error
 code containing the fault code, and the error message containing
 the fault string. (If method_response cannot be parsed at all,
-soup_xmlrpc_parse_method_response() will return FALSE, but error
+soup_xmlrpc_parse_method_response() will return FALSE, but error
 will be unset.)
 

 

 

 

@@ -218,7 +218,7 @@
 
-
@@ -228,7 +228,7 @@
 
-
@@ -238,10 +238,10 @@
 

 
soup_xmlrpc_extract_method_response ()

-
gboolean            soup_xmlrpc_extract_method_response (const char *method_response,
+
gboolean            soup_xmlrpc_extract_method_response (const char *method_response,
                                                          int length,
-                                                         GError **error,
-                                                         GType type,
+                                                         GError **error,
+                                                         GType type,
                                                          ...);

 

 Parses method_response and extracts the return value into
@@ -252,7 +252,7 @@
 and error will be set to an error of type SOUP_XMLRPC_FAULT, with
 the error code containing the fault code, and the error message
 containing the fault string. (If method_response cannot be parsed
-at all, soup_xmlrpc_extract_method_response() will return FALSE,
+at all, soup_xmlrpc_extract_method_response() will return FALSE,
 but error will be unset.)
 

 

 

 
value :
 on return, the return value from method_call. [out]
+on return, the return value from method_call
 
 

 

 

 
Returns :
 TRUE if a return value was parsed, FALSE if the
+ TRUE if a return value was parsed, FALSE if the
 response could not be parsed, or contained a fault.
 
 

 

@@ -285,7 +285,7 @@
 
-
@@ -295,13 +295,13 @@
 

 
soup_xmlrpc_parse_method_call ()

-
gboolean            soup_xmlrpc_parse_method_call       (const char *method_call,
+
gboolean            soup_xmlrpc_parse_method_call       (const char *method_call,
                                                          int length,
                                                          char **method_name,
-                                                         GValueArray **params);

+                                                         GValueArray **params);

 

 Parses method_call to get the name and parameters, and returns the
-parameter values in a GValueArray; see also
+parameter values in a GValueArray; see also
 soup_xmlrpc_extract_method_call(), which is more convenient if you
 know in advance what the types of the parameters will be.
 

@@ -320,12 +320,12 @@
 
 

-
-
@@ -339,7 +339,7 @@
 

 
soup_xmlrpc_extract_method_call ()

-
gboolean            soup_xmlrpc_extract_method_call     (const char *method_call,
+
gboolean            soup_xmlrpc_extract_method_call     (const char *method_call,
                                                          int length,
                                                          char **method_name,
                                                          ...);

@@ -350,7 +350,7 @@
 

 The parameters are handled similarly to
 soup_xmlrpc_build_method_call, with pairs of types and values,
-terminated by G_TYPE_INVALID, except that values are pointers to
+terminated by G_TYPE_INVALID, except that values are pointers to
 variables of the indicated type, rather than values of the type.
 

 

@@ -372,7 +372,7 @@
 

-
@@ -391,7 +391,7 @@
 

 
soup_xmlrpc_build_method_response ()

-
char *              soup_xmlrpc_build_method_response   (GValue *value);

+
char *              soup_xmlrpc_build_method_response   (GValue *value);

 

 This creates a (successful) XML-RPC methodResponse and returns it
 as a string. To create a fault response, use
@@ -411,7 +411,7 @@
 

-
@@ -458,7 +458,7 @@
 

 
soup_xmlrpc_set_response ()

 
void                soup_xmlrpc_set_response            (SoupMessage *msg,
-                                                         GType type,
+                                                         GType type,
                                                          ...);

 

 Sets the status code and response body of msg to indicate a
diff -Nru libsoup2.4-2.30.1/docs/reference/html/libsoup-build-howto.html libsoup2.4-2.30.2/docs/reference/html/libsoup-build-howto.html
--- libsoup2.4-2.30.1/docs/reference/html/libsoup-build-howto.html	2010-04-26 21:56:18.000000000 +0100
+++ libsoup2.4-2.30.2/docs/reference/html/libsoup-build-howto.html	2010-06-22 18:08:01.000000000 +0100
@@ -29,7 +29,7 @@
 

 

 
Returns :
 TRUE if a return value was parsed, FALSE if the
+ TRUE if a return value was parsed, FALSE if the
 response was of the wrong type, or contained a fault.
 
 

 

 
method_name :
 on return, the methodName from method_call. [out]
+on return, the methodName from method_call
 
 

 

 
params :
 on return, the parameters from method_call. [out]
+on return, the parameters from method_call
 
 

 

 

 

 
method_name :
 on return, the methodName from method_call. [out]
+on return, the methodName from method_call
 
 

 

 

 

 
Returns :
 the text of the methodResponse, or NULL on error
+ the text of the methodResponse, or NULL on error
 
 

 

 

 

-
Using pkg-config

+
Using pkg-config

 

 Like other GNOME libraries, libsoup uses
 pkg-config to provide compiler options. The
@@ -117,7 +117,7 @@
 

 

 

-
Headers

+
Headers

 

 Code using libsoup should do:
 

diff -Nru libsoup2.4-2.30.1/docs/reference/html/libsoup-client-howto.html libsoup2.4-2.30.2/docs/reference/html/libsoup-client-howto.html
--- libsoup2.4-2.30.1/docs/reference/html/libsoup-client-howto.html	2010-04-26 21:56:18.000000000 +0100
+++ libsoup2.4-2.30.2/docs/reference/html/libsoup-client-howto.html	2010-06-22 18:08:01.000000000 +0100
@@ -29,7 +29,7 @@
 
 

 

-
Creating a SoupSession
+
Creating a SoupSession
 

 

 The first step in using the client API is to create a SoupSession. The session object
@@ -66,7 +66,7 @@
 
 
 
-
SOUP_SESSION_MAX_CONNS

+
SOUP_SESSION_MAX_CONNS

 

 	    Allows you to set the maximum total number of connections
 	    the session will have open at one time. (Once it reaches
@@ -76,7 +76,7 @@
 	

 
 
-
SOUP_SESSION_MAX_CONNS_PER_HOST

+
SOUP_SESSION_MAX_CONNS_PER_HOST

 

 	    Allows you to set the maximum total number of connections
 	    the session will have open to a single
@@ -84,7 +84,7 @@
 	

 
 
-
SOUP_SESSION_USE_NTLM

+
SOUP_SESSION_USE_NTLM

 

 	    If TRUE, then Microsoft NTLM
 	    authentication will be used if available (and will be
@@ -97,7 +97,7 @@
 	

 
 
-
SOUP_SESSION_SSL_CA_FILE

+
SOUP_SESSION_SSL_CA_FILE

 

 	    Points to a file containing certificates for recognized
 	    SSL Certificate Authorities. If this is set, then HTTPS
@@ -107,9 +107,9 @@
 	

 
 
-
SOUP_SESSION_ASYNC_CONTEXT

+
SOUP_SESSION_ASYNC_CONTEXT

 

-	    A GMainContext
+	    A GMainContext
 	    which the session will use for asynchronous operations.
 	    This can be set if you want to use a
 	    SoupSessionAsync in a thread other than the
@@ -117,7 +117,7 @@
 	

 
 
-
SOUP_SESSION_ADD_FEATURE and SOUP_SESSION_ADD_FEATURE_BY_TYPE

+
SOUP_SESSION_ADD_FEATURE and SOUP_SESSION_ADD_FEATURE_BY_TYPE

 

 	    These allow you to specify SoupSessionFeatures
 	    (discussed below)
@@ -137,8 +137,8 @@
 
Session features

 

 Additional session functionality is provided as SoupSessionFeatures,
-which can be added to a session, via the SOUP_SESSION_ADD_FEATURE
-and SOUP_SESSION_ADD_FEATURE_BY_TYPE
+which can be added to a session, via the SOUP_SESSION_ADD_FEATURE
+and SOUP_SESSION_ADD_FEATURE_BY_TYPE
 options at session-construction-time, or afterward via the soup_session_add_feature
 and soup_session_add_feature_by_type
 functions. Some of the features available in
@@ -172,7 +172,7 @@
 
 
 
-
SoupProxyResolverGNOME

+
SoupProxyResolverGNOME

 

 	    A feature that automatically determines the correct HTTP
 	    proxy to use for requests.
@@ -189,7 +189,7 @@
 

 

 Use the "add_feature_by_type" property/function to add features that
-don't require any configuration (such as SoupProxyResolverGNOME),
+don't require any configuration (such as SoupProxyResolverGNOME),
 and the "add_feature" property/function to add features that must be
 constructed first (such as SoupLogger). For example, an
 application might do something like the following:
@@ -214,13 +214,13 @@
 #ifdef HAVE_LIBSOUP_GNOME
 	SOUP_SESSION_ADD_FEATURE_BY_TYPE, SOUP_TYPE_PROXY_RESOLVER_GNOME,
 #endif
-	NULL);
+	NULL);
 if (debug_level) {
 	SoupLogger *logger;
 
 	logger = soup_logger_new (debug_level, -1);
 	soup_session_add_feature (session, SOUP_SESSION_FEATURE (logger));
-	g_object_unref (logger);
+	g_object_unref (logger);
 }

       
     
@@ -230,7 +230,7 @@
 

 

 

-
Creating and Sending SoupMessages

+
Creating and Sending SoupMessages

 

 Once you have a session, you do HTTP traffic using SoupMessage. In the simplest
 case, you only need to create the message and it's ready to send:
@@ -279,7 +279,7 @@
 (Although this is a bad example, because
 libsoup actually has convenience methods
 for dealing with HTML
-forms, as well as XML-RPC.)
+forms, as well as XML-RPC.)
 

 

 You can also use soup_message_set_flags
@@ -290,7 +290,7 @@
 flag.
 

 

-
Sending a Message Synchronously

+
Sending a Message Synchronously

 

 To send a message and wait for the response, use soup_session_send_message:
 

@@ -301,7 +301,7 @@
         
1
 2
 3

-        
guint status;
+        
guint status;
 
 status = soup_session_send_message (session, msg);

       
@@ -324,7 +324,7 @@
 

 

 

-
Sending a Message Asynchronously

+
Sending a Message Asynchronously

 

 To send a message asynchronously, use soup_session_queue_message:
 

@@ -348,7 +348,7 @@
 }
 
 static void
-my_callback (SoupSession, *session, SoupMessage *msg, gpointer user_data)
+my_callback (SoupSession, *session, SoupMessage *msg, gpointer user_data)
 {
 /* Handle the response here */
 }
@@ -379,13 +379,13 @@ (If you use soup_session_queue_message with a SoupSessionSync, the message will be sent in another thread, with the callback eventually -being invoked in the session's SOUP_SESSION_ASYNC_CONTEXT.) +being invoked in the session's SOUP_SESSION_ASYNC_CONTEXT.)

-

Processing the Response

+

Processing the Response

Once you have received the response from the server, synchronously or asynchronously, you can look at the response fields in the @@ -414,7 +414,7 @@

-

Intermediate/Automatic Processing

+

Intermediate/Automatic Processing

You can also connect to various SoupMessage signals to do processing at intermediate stages of HTTP I/O. Eg, the got-chunk @@ -440,7 +440,7 @@

-

Handling Authentication

+

Handling Authentication

SoupSession handles most of the details of HTTP authentication for you. If it receives a 401 ("Unauthorized") or 407 @@ -482,7 +482,7 @@

-

Multi-threaded usage

+

Multi-threaded usage

The only explicitly thread-safe operations in libsoup are SoupSessionSync's @@ -499,14 +499,14 @@ All other objects (including SoupSessionAsync) should only be used from a single thread, with objects that are also only be used from that thread. (And in particular, if you set a -non-default GMainContext on a session, +non-default GMainContext on a session, socket, etc, then you can only use that object from the thread in which that GMainContext is running.)

-

Sample Programs

+

Sample Programs

A few sample programs are available in the libsoup sources: diff -Nru libsoup2.4-2.30.1/docs/reference/html/libsoup-porting-2.2-2.4.html libsoup2.4-2.30.2/docs/reference/html/libsoup-porting-2.2-2.4.html --- libsoup2.4-2.30.1/docs/reference/html/libsoup-porting-2.2-2.4.html 2010-04-26 21:56:18.000000000 +0100 +++ libsoup2.4-2.30.2/docs/reference/html/libsoup-porting-2.2-2.4.html 2010-06-22 18:08:00.000000000 +0100 @@ -29,7 +29,7 @@

-

Overview

+

Overview

After many API-compatible releases in the 2.2 series, libsoup has now changed its API and bumped @@ -53,14 +53,14 @@

-

SoupMessage

+

SoupMessage

SoupMessage has had a number of API changes made, mostly to increase its language-bindability.

-

SoupMessageHeaders

+

SoupMessageHeaders

SoupMessage's request_headers and @@ -135,7 +135,7 @@

-

SoupMessageBody

+

SoupMessageBody

Similarly, the request_body and response fields (renamed from @@ -215,7 +215,7 @@

-

Chunked encoding

+

Chunked encoding

The prototype of the SoupMessage::got_chunk signal has been changed; it now includes the chunk as a @@ -265,7 +265,7 @@

-

Methods

+

Methods

SoupMessage's method field is now an interned @@ -277,7 +277,7 @@

-

Handlers

+

Handlers

soup_message_add_header_handler and soup_message_add_status_code_handler @@ -293,7 +293,7 @@

-

I/O-related SoupMessage methods

+

I/O-related SoupMessage methods

soup_message_io_pause and soup_message_io_unpause have been moved to @@ -330,7 +330,7 @@

-

HTTP-Version

+

HTTP-Version

SoupHttpVersion is now SoupHTTPVersion

@@ -338,9 +338,9 @@
-

SoupSession

+

SoupSession

-

+

soup_session_queue_message callback

soup_session_queue_message's @@ -352,7 +352,7 @@

-

Authentication

+

Authentication

SoupSession's authenticate and reauthenticate signals have been merged into a @@ -366,7 +366,7 @@

-

SoupLogger

+

SoupLogger

SoupLogger is a new object that copies the behavior of @@ -377,7 +377,7 @@

-

SoupMessageFilter

+

SoupMessageFilter

SoupMessageFilter is gone; code that used to use it can now connect to the SoupSession::request-started @@ -386,7 +386,7 @@

-

Internal types

+

Internal types

The SoupConnection and SoupMessageQueue types (which should always have been internal to @@ -396,7 +396,7 @@

-

SoupURI

+

SoupURI

SoupUri has been renamed SoupURI, and its behavior has changed in a few ways: @@ -462,7 +462,7 @@

Finally, SoupURI (as well as most other struct types in libsoup) now uses the glib "slice" -allocator, so any code that uses g_new to create +allocator, so any code that uses g_new to create SoupURIs is wrong. If you want to create a URI "by hand", you can call soup_uri_new, passing NULL, and you will get back an empty @@ -472,7 +472,7 @@ etc) rather than mucking with the fields directly.

-

Forms

+

Forms

Related to SoupURI, there are some new helper methods for dealing with HTML forms. soup_form_decode_urlencoded @@ -488,9 +488,9 @@

-

XML-RPC and SOAP

+

XML-RPC and SOAP

-

SOAP

+

SOAP

SOAP support has been removed; the existing methods covered only a teeny tiny subset of SOAP, which was really only useful to a single @@ -501,7 +501,7 @@

-

XML-RPC

+

XML-RPC

The XML-RPC code has been completely rewritten to make it simpler to implement XML-RPC clients and servers. (Note: the server-side code has @@ -514,25 +514,25 @@

int

- → int (G_TYPE_INT) + → int (G_TYPE_INT)

boolean

- → gboolean (G_TYPE_BOOLEAN) + → gboolean (G_TYPE_BOOLEAN)

string

- → char * (G_TYPE_STRING) + → char * (G_TYPE_STRING)

double

- → double (G_TYPE_DOUBLE) + → double (G_TYPE_DOUBLE)

@@ -550,13 +550,13 @@

struct

- → GHashTable (G_TYPE_HASH_TABLE) + → GHashTable (G_TYPE_HASH_TABLE)

array

- → GValueArray (G_TYPE_VALUE_ARRAY) + → GValueArray (G_TYPE_VALUE_ARRAY)

@@ -591,9 +591,9 @@
-

SoupServer

+

SoupServer

-

SoupServer handlers

+

SoupServer handlers

The prototypes for soup_server_add_handler, and for the SoupServer @@ -618,15 +618,15 @@ 

typedef void (*SoupServerCallback)     (SoupServer         *server,
 					SoupMessage        *msg, 
 					const char         *path,
-					GHashTable         *query,
+					GHashTable         *query,
 					SoupClientContext  *client,
-					gpointer            user_data);
+					gpointer            user_data);
 
 void           soup_server_add_handler (SoupServer         *server,
 					const char         *path,
 					SoupServerCallback  callback,
-					gpointer            data,
-					GDestroyNotify      destroy);
+ gpointer data, + GDestroyNotify destroy); @@ -668,7 +668,7 @@

-

Server-side authentication

+

Server-side authentication

SoupServer authentication has been completely rewritten, with SoupServerAuthContext being replaced @@ -680,7 +680,7 @@

-

+

Expect: 100-continue and other early SoupMessage processing

SoupServer now handles @@ -699,7 +699,7 @@

-

Date header

+

Date header

SoupServer now automatically sets the Date header on all responses, as required by @@ -707,7 +707,7 @@

-

SoupServerMessage

+

SoupServerMessage

SoupServerMessage is now merged into SoupMessage. @@ -717,7 +717,7 @@

-

+

soup_server_run / soup_server_quit

@@ -731,9 +731,9 @@

-

Miscellaneous

+

Miscellaneous

-

SoupDate

+

SoupDate

The new SoupDate type replaces the old soup_date_* methods, and has @@ -741,14 +741,14 @@

-

Header parsing

+

Header parsing

soup-headers.h now has a few additional methods for parsing list-type headers.

-

SoupAddress, SoupSocket

+

SoupAddress, SoupSocket

SoupSocket has had various simplifications made to reflect the fact that this is specifically libsoup's socket @@ -756,17 +756,17 @@

Various SoupAddress and SoupSocket - methods now take arguments of the new GCancellable type, from + methods now take arguments of the new GCancellable type, from libgio. When porting old code, you can just pass NULL for these. (soup_address_resolve_async - also takes another new argument, a GMainContext that + also takes another new argument, a GMainContext that you'll want to pass NULL for.) If you pass a GCancellable, you can use it to cleanly cancel the address resolution / socket operation.

-

Base64 methods

+

Base64 methods

The deprecated base64 methods are now gone; use glib's base64 methods instead. diff -Nru libsoup2.4-2.30.1/docs/reference/html/libsoup-server-howto.html libsoup2.4-2.30.2/docs/reference/html/libsoup-server-howto.html --- libsoup2.4-2.30.1/docs/reference/html/libsoup-server-howto.html 2010-04-26 21:56:18.000000000 +0100 +++ libsoup2.4-2.30.2/docs/reference/html/libsoup-server-howto.html 2010-06-22 18:08:01.000000000 +0100 @@ -29,7 +29,7 @@

-

Creating a SoupSession

+

Creating a SoupSession

As with the client API, there is a single object that will encapsulate most of your interactions with libsoup. In this case, SoupServer. @@ -43,7 +43,7 @@ -

SOUP_SERVER_PORT

+

SOUP_SERVER_PORT

The TCP port to listen on. If 0 (or left unspecified), some unused port will be selected for @@ -51,7 +51,7 @@

-

SOUP_SERVER_INTERFACE

+

SOUP_SERVER_INTERFACE

A SoupAddress, specifying the IP address of the network interface to run @@ -60,7 +60,7 @@

-

SOUP_SERVER_SSL_CERT_FILE

+

SOUP_SERVER_SSL_CERT_FILE

Points to a file containing an SSL certificate to use. If this is set, then the server will speak HTTPS; otherwise @@ -68,7 +68,7 @@

-

SOUP_SERVER_SSL_KEY_FILE

+

SOUP_SERVER_SSL_KEY_FILE

Points to a file containing the private key for the SOUP_SERVER_SSL_CERT_FILE. (It may @@ -76,16 +76,16 @@

-

SOUP_SERVER_ASYNC_CONTEXT

+

SOUP_SERVER_ASYNC_CONTEXT

- A GMainContext which + A GMainContext which the server will use for asynchronous operations. This can be set if you want to use a SoupServer in a thread other than the main thread.

-

SOUP_SERVER_RAW_PATHS

+

SOUP_SERVER_RAW_PATHS

Set this to TRUE if you don't want libsoup to decode %-encoding @@ -99,7 +99,7 @@

-

Adding Handlers

+

Adding Handlers

By default, SoupServer returns "404 Not Found" in response to all requests (except ones that @@ -138,7 +138,7 @@

-

Responding to Requests

+

Responding to Requests

A handler callback looks something like this:

@@ -160,9 +160,9 @@ server_callback (SoupServer *server, SoupMessage *msg, const char *path, - GHashTable *query, + GHashTable *query, SoupClientContext *client, - gpointer user_data) + gpointer user_data) { ... } @@ -201,7 +201,7 @@ chunked encoding.

-

Responding with Content-Length +

Responding with Content-Length Encoding

This is the simpler way to set a response body, if you have all of the @@ -246,13 +246,13 @@ server_callback (SoupServer *server, SoupMessage *msg, const char *path, - GHashTable *query, + GHashTable *query, SoupClientContext *client, - gpointer user_data) + gpointer user_data) { MyServerData *server_data = user_data; const char *mime_type; - GByteArray *body; + GByteArray *body; if (msg->method != SOUP_METHOD_GET) { soup_message_set_status (msg, SOUP_STATUS_NOT_IMPLEMENTED); @@ -262,8 +262,8 @@ /* This is somewhat silly. Presumably your server will do * something more interesting. */ - body = g_hash_table_lookup (server_data->bodies, path); - mime_type = g_hash_table_lookup (server_data->mime_types, path); + body = g_hash_table_lookup (server_data->bodies, path); + mime_type = g_hash_table_lookup (server_data->mime_types, path); if (!body || !mime_type) { soup_message_set_status (msg, SOUP_STATUS_NOT_FOUND); return; @@ -280,7 +280,7 @@

-

Responding with chunked Encoding

+

Responding with chunked Encoding

If you want to supply the response body in chunks as it becomes available, use chunked encoding instead. In this @@ -314,7 +314,7 @@

-

Handling Authentication

+

Handling Authentication

To have SoupServer handle HTTP authentication for you, create a SoupAuthDomainBasic @@ -344,9 +344,9 @@ SOUP_AUTH_DOMAIN_BASIC_AUTH_DATA, auth_data, SOUP_AUTH_DOMAIN_ADD_PATH, "/foo", SOUP_AUTH_DOMAIN_ADD_PATH, "/bar/private", - NULL); + NULL); soup_server_add_auth_domain (server, domain); -g_object_unref (domain); +g_object_unref (domain); @@ -378,17 +378,17 @@ 15 16 17 - 

static gboolean
+        
static gboolean
 auth_callback (SoupAuthDomain *domain, SoupMessage *msg,
 	       const char *username, const char *password,
-	       gpointer user_data)
+	       gpointer user_data)
 {
 	MyServerData *server_data = user_data;
 	MyUserData *user;
 
 	user = my_server_data_lookup_user (server_data, username);
 	if (!user)
-		return FALSE;
+		return FALSE;
 
 	/* FIXME: Don't do this. Keeping a cleartext password database
 	 * is bad.
diff -Nru libsoup2.4-2.30.1/docs/reference/html/SoupAddress.html libsoup2.4-2.30.2/docs/reference/html/SoupAddress.html
--- libsoup2.4-2.30.1/docs/reference/html/SoupAddress.html	2010-04-26 21:56:18.000000000 +0100
+++ libsoup2.4-2.30.2/docs/reference/html/SoupAddress.html	2010-06-22 18:08:01.000000000 +0100
@@ -48,36 +48,36 @@
 enum                SoupAddressFamily;
 #define             SOUP_ADDRESS_ANY_PORT
 SoupAddress *       soup_address_new                    (const char *name,
-                                                         guint port);
+                                                         guint port);
 SoupAddress *       soup_address_new_from_sockaddr      (struct sockaddr *sa,
                                                          int len);
 SoupAddress *       soup_address_new_any                (SoupAddressFamily family,
-                                                         guint port);
+                                                         guint port);
 
 void                (*SoupAddressCallback)              (SoupAddress *addr,
-                                                         guint status,
-                                                         gpointer data);
+                                                         guint status,
+                                                         gpointer data);
 void                soup_address_resolve_async          (SoupAddress *addr,
-                                                         GMainContext *async_context,
-                                                         GCancellable *cancellable,
+                                                         GMainContext *async_context,
+                                                         GCancellable *cancellable,
                                                          SoupAddressCallback callback,
-                                                         gpointer user_data);
-guint               soup_address_resolve_sync           (SoupAddress *addr,
-                                                         GCancellable *cancellable);
-gboolean            soup_address_is_resolved            (SoupAddress *addr);
+                                                         gpointer user_data);
+guint               soup_address_resolve_sync           (SoupAddress *addr,
+                                                         GCancellable *cancellable);
+gboolean            soup_address_is_resolved            (SoupAddress *addr);
 
 const char *        soup_address_get_name               (SoupAddress *addr);
 struct sockaddr *   soup_address_get_sockaddr           (SoupAddress *addr,
                                                          int *len);
 const char *        soup_address_get_physical           (SoupAddress *addr);
-guint               soup_address_get_port               (SoupAddress *addr);
+guint               soup_address_get_port               (SoupAddress *addr);
 
-gboolean            soup_address_equal_by_name          (gconstpointer addr1,
-                                                         gconstpointer addr2);
-guint               soup_address_hash_by_name           (gconstpointer addr);
-gboolean            soup_address_equal_by_ip            (gconstpointer addr1,
-                                                         gconstpointer addr2);
-guint               soup_address_hash_by_ip             (gconstpointer addr);
+gboolean            soup_address_equal_by_name          (gconstpointer addr1,
+                                                         gconstpointer addr2);
+guint               soup_address_hash_by_name           (gconstpointer addr);
+gboolean            soup_address_equal_by_ip            (gconstpointer addr1,
+                                                         gconstpointer addr2);
+guint               soup_address_hash_by_ip             (gconstpointer addr);
 
 #define             SOUP_ADDRESS_FAMILY
 #define             SOUP_ADDRESS_NAME
@@ -89,7 +89,7 @@
 

 
Object Hierarchy

 
-  GObject
+  GObject
    +----SoupAddress
 

 

@@ -97,10 +97,10 @@
 
Properties

 
   "family"                   SoupAddressFamily     : Read / Write / Construct Only
-  "name"                     gchar*                : Read / Write / Construct Only
-  "physical"                 gchar*                : Read
-  "port"                     gint                  : Read / Write / Construct Only
-  "sockaddr"                 gpointer              : Read / Write / Construct Only
+  "name"                     gchar*                : Read / Write / Construct Only
+  "physical"                 gchar*                : Read
+  "port"                     gint                  : Read / Write / Construct Only
+  "sockaddr"                 gpointer              : Read / Write / Construct Only
@@ -167,7 +167,7 @@

soup_address_new ()

SoupAddress *       soup_address_new                    (const char *name,
-                                                         guint port);
+ guint port);

Creates a SoupAddress from name and port. The SoupAddress's IP address may not be available right away; the caller can call @@ -201,7 +201,7 @@ 

SoupAddress *       soup_address_new_from_sockaddr      (struct sockaddr *sa,
                                                          int len);

-Returns a SoupAddress equivalent to sa (or NULL if sa's +Returns a SoupAddress equivalent to sa (or NULL if sa's address family isn't supported)

@@ -219,7 +219,7 @@ - @@ -229,10 +229,10 @@

soup_address_new_any ()

SoupAddress *       soup_address_new_any                (SoupAddressFamily family,
-                                                         guint port);
+ guint port);

Returns a SoupAddress corresponding to the "any" address -for family (or NULL if family isn't supported), suitable for +for family (or NULL if family isn't supported), suitable for passing to soup_socket_server_new().

Returns :

 the new SoupAddress. [allow-none] + the new SoupAddress
@@ -250,7 +250,7 @@ - @@ -260,8 +260,8 @@

SoupAddressCallback ()

void                (*SoupAddressCallback)              (SoupAddress *addr,
-                                                         guint status,
-                                                         gpointer data);
+ guint status, + gpointer data);

The callback function passed to soup_address_resolve_async().

@@ -293,10 +293,10 @@

soup_address_resolve_async ()

void                soup_address_resolve_async          (SoupAddress *addr,
-                                                         GMainContext *async_context,
-                                                         GCancellable *cancellable,
+                                                         GMainContext *async_context,
+                                                         GCancellable *cancellable,
                                                          SoupAddressCallback callback,
-                                                         gpointer user_data);
+ gpointer user_data);

Asynchronously resolves the missing half of addr (its IP address if it was created with soup_address_new(), or its hostname if it @@ -304,7 +304,7 @@ soup_address_new_any().)

-If cancellable is non-NULL, it can be used to cancel the +If cancellable is non-NULL, it can be used to cancel the resolution. callback will still be invoked in this case, with a status of SOUP_STATUS_CANCELLED.

@@ -325,17 +325,17 @@
- - - @@ -349,14 +349,14 @@

soup_address_resolve_sync ()

-
guint               soup_address_resolve_sync           (SoupAddress *addr,
-                                                         GCancellable *cancellable);
+
guint               soup_address_resolve_sync           (SoupAddress *addr,
+                                                         GCancellable *cancellable);

Synchronously resolves the missing half of addr, as with soup_address_resolve_async().

-If cancellable is non-NULL, it can be used to cancel the +If cancellable is non-NULL, it can be used to cancel the resolution. soup_address_resolve_sync() will then return a status of SOUP_STATUS_CANCELLED.

@@ -376,7 +376,7 @@
- @@ -391,7 +391,7 @@

soup_address_is_resolved ()

-
gboolean            soup_address_is_resolved            (SoupAddress *addr);
+
gboolean            soup_address_is_resolved            (SoupAddress *addr);

Tests if addr has already been resolved. Unlike the other SoupAddress "get" methods, this is safe to call when addr might @@ -407,7 +407,7 @@

- @@ -436,7 +436,7 @@ - @@ -449,7 +449,7 @@ int *len);

Returns the sockaddr associated with addr, with its length in -*len. If the sockaddr is not yet known, returns NULL. +*len. If the sockaddr is not yet known, returns NULL.

This method is not thread-safe; if you call it while addr is being @@ -472,7 +472,7 @@

- @@ -484,7 +484,7 @@ 
const char *        soup_address_get_physical           (SoupAddress *addr);

Returns the physical address associated with addr as a string. -(Eg, "127.0.0.1"). If the address is not yet known, returns NULL. +(Eg, "127.0.0.1"). If the address is not yet known, returns NULL.

This method is not thread-safe; if you call it while addr is being @@ -502,7 +502,7 @@

- @@ -511,7 +511,7 @@

soup_address_get_port ()

-
guint               soup_address_get_port               (SoupAddress *addr);
+
guint               soup_address_get_port               (SoupAddress *addr);

Returns the port associated with addr.

@@ -534,11 +534,11 @@

soup_address_equal_by_name ()

-
gboolean            soup_address_equal_by_name          (gconstpointer addr1,
-                                                         gconstpointer addr2);
+
gboolean            soup_address_equal_by_name          (gconstpointer addr1,
+                                                         gconstpointer addr2);

Tests if addr1 and addr2 have the same "name". This method can be -used with soup_address_hash_by_name() to create a GHashTable that +used with soup_address_hash_by_name() to create a GHashTable that hashes on address "names".

@@ -589,9 +589,9 @@

soup_address_hash_by_name ()

-
guint               soup_address_hash_by_name           (gconstpointer addr);
+
guint               soup_address_hash_by_name           (gconstpointer addr);

-A hash function (for GHashTable) that corresponds to +A hash function (for GHashTable) that corresponds to soup_address_equal_by_name(), qv

Returns :

 the new SoupAddress. [allow-none] + the new SoupAddress

async_context :

the GMainContext to call callback from +the GMainContext to call callback from

cancellable :

a GCancellable object, or NULL +a GCancellable object, or NULL

callback :

 callback to call with the result. [scope async] +callback to call with the result

cancellable :

a GCancellable object, or NULL +a GCancellable object, or NULL

Returns :

 TRUE if addr has been resolved. + TRUE if addr has been resolved.

Returns :

 the hostname, or NULL if it is not known.. [allow-none] + the hostname, or NULL if it is not known.

Returns :

 the sockaddr, or NULL. [allow-none] + the sockaddr, or NULL

Returns :

 the physical address, or NULL. [allow-none] + the physical address, or NULL
@@ -615,12 +615,12 @@

soup_address_equal_by_ip ()

-
gboolean            soup_address_equal_by_ip            (gconstpointer addr1,
-                                                         gconstpointer addr2);
+
gboolean            soup_address_equal_by_ip            (gconstpointer addr1,
+                                                         gconstpointer addr2);

Tests if addr1 and addr2 have the same IP address. This method can be used with soup_address_hash_by_ip() to create a -GHashTable that hashes on IP address. +GHashTable that hashes on IP address.

This would be used to distinguish hosts in situations where @@ -660,9 +660,9 @@

soup_address_hash_by_ip ()

-
guint               soup_address_hash_by_ip             (gconstpointer addr);
+
guint               soup_address_hash_by_ip             (gconstpointer addr);

-A hash function (for GHashTable) that corresponds to +A hash function (for GHashTable) that corresponds to soup_address_equal_by_ip(), qv

@@ -745,21 +745,21 @@

The "name" property

-
  "name"                     gchar*                : Read / Write / Construct Only
+
  "name"                     gchar*                : Read / Write / Construct Only

Hostname for this address.

Default value: NULL

The "physical" property

-
  "physical"                 gchar*                : Read
+
  "physical"                 gchar*                : Read

IP address for this address.

Default value: NULL

The "port" property

-
  "port"                     gint                  : Read / Write / Construct Only
+
  "port"                     gint                  : Read / Write / Construct Only

Port for this address.

Allowed values: [G_MAXULONG,65535]

Default value: -1

@@ -767,7 +767,7 @@

The "sockaddr" property

-
  "sockaddr"                 gpointer              : Read / Write / Construct Only
+
  "sockaddr"                 gpointer              : Read / Write / Construct Only

struct sockaddr for this address.

diff -Nru libsoup2.4-2.30.1/docs/reference/html/SoupAuthDomainBasic.html libsoup2.4-2.30.2/docs/reference/html/SoupAuthDomainBasic.html --- libsoup2.4-2.30.1/docs/reference/html/SoupAuthDomainBasic.html 2010-04-26 21:56:18.000000000 +0100 +++ libsoup2.4-2.30.2/docs/reference/html/SoupAuthDomainBasic.html 2010-06-22 18:08:01.000000000 +0100 @@ -48,16 +48,16 @@ SoupAuthDomain * soup_auth_domain_basic_new (const char *optname1, ...); -gboolean (*SoupAuthDomainBasicAuthCallback) (SoupAuthDomain *domain, +gboolean (*SoupAuthDomainBasicAuthCallback) (SoupAuthDomain *domain, SoupMessage *msg, const char *username, const char *password, - gpointer user_data); + gpointer user_data); voidsoup_auth_domain_basic_set_auth_callback (SoupAuthDomain *domain, SoupAuthDomainBasicAuthCallback callback, - gpointer user_data, - GDestroyNotify dnotify); + gpointer user_data, + GDestroyNotify dnotify); #define SOUP_AUTH_DOMAIN_BASIC_AUTH_CALLBACK #define SOUP_AUTH_DOMAIN_BASIC_AUTH_DATA @@ -66,7 +66,7 @@

Object Hierarchy

-  GObject
+  GObject
    +----SoupAuthDomain
          +----SoupAuthDomainBasic
@@ -74,8 +74,8 @@

Properties

-  "auth-callback"            gpointer              : Read / Write
-  "auth-data"                gpointer              : Read / Write
+  "auth-callback"            gpointer              : Read / Write
+  "auth-data"                gpointer              : Read / Write
@@ -109,7 +109,7 @@
- @@ -128,15 +128,15 @@

SoupAuthDomainBasicAuthCallback ()

-
gboolean            (*SoupAuthDomainBasicAuthCallback)  (SoupAuthDomain *domain,
+
gboolean            (*SoupAuthDomainBasicAuthCallback)  (SoupAuthDomain *domain,
                                                          SoupMessage *msg,
                                                          const char *username,
                                                          const char *password,
-                                                         gpointer user_data);

+                                                         gpointer user_data);

Callback used by SoupAuthDomainBasic for authentication purposes. The application should verify that username and password and valid -and return TRUE or FALSE. +and return TRUE or FALSE.

If you are maintaining your own password database (rather than @@ -180,7 +180,7 @@

- @@ -192,8 +192,8 @@ 
void                soup_auth_domain_basic_set_auth_callback
                                                         (SoupAuthDomain *domain,
                                                          SoupAuthDomainBasicAuthCallback callback,
-                                                         gpointer user_data,
-                                                         GDestroyNotify dnotify);
+ gpointer user_data, + GDestroyNotify dnotify);

Sets the callback that domain will use to authenticate incoming requests. For each request containing authorization, domain will @@ -258,13 +258,13 @@

Property Details

The "auth-callback" property

-
  "auth-callback"            gpointer              : Read / Write
+
  "auth-callback"            gpointer              : Read / Write

Password-checking callback.

The "auth-data" property

-
  "auth-data"                gpointer              : Read / Write
+
  "auth-data"                gpointer              : Read / Write

Data to pass to authentication callback.

diff -Nru libsoup2.4-2.30.1/docs/reference/html/SoupAuthDomainDigest.html libsoup2.4-2.30.2/docs/reference/html/SoupAuthDomainDigest.html --- libsoup2.4-2.30.1/docs/reference/html/SoupAuthDomainDigest.html 2010-04-26 21:56:18.000000000 +0100 +++ libsoup2.4-2.30.2/docs/reference/html/SoupAuthDomainDigest.html 2010-06-22 18:08:01.000000000 +0100 @@ -51,12 +51,12 @@ char * (*SoupAuthDomainDigestAuthCallback) (SoupAuthDomain *domain, SoupMessage *msg, const char *username, - gpointer user_data); + gpointer user_data); voidsoup_auth_domain_digest_set_auth_callback (SoupAuthDomain *domain, SoupAuthDomainDigestAuthCallback callback, - gpointer user_data, - GDestroyNotify dnotify); + gpointer user_data, + GDestroyNotify dnotify); char * soup_auth_domain_digest_encode_password (const char *username, const char *realm, @@ -69,7 +69,7 @@

Object Hierarchy

-  GObject
+  GObject
    +----SoupAuthDomain
          +----SoupAuthDomainDigest
@@ -77,8 +77,8 @@

Properties

-  "auth-callback"            gpointer              : Read / Write
-  "auth-data"                gpointer              : Read / Write
+  "auth-callback"            gpointer              : Read / Write
+  "auth-data"                gpointer              : Read / Write
@@ -112,7 +112,7 @@
- @@ -134,7 +134,7 @@ 
char *              (*SoupAuthDomainDigestAuthCallback) (SoupAuthDomain *domain,
                                                          SoupMessage *msg,
                                                          const char *username,
-                                                         gpointer user_data);
+ gpointer user_data);

Callback used by SoupAuthDomainDigest for authentication purposes. The application should look up username in its password database, @@ -166,7 +166,7 @@

- @@ -179,8 +179,8 @@ 
void                soup_auth_domain_digest_set_auth_callback
                                                         (SoupAuthDomain *domain,
                                                          SoupAuthDomainDigestAuthCallback callback,
-                                                         gpointer user_data,
-                                                         GDestroyNotify dnotify);
+ gpointer user_data, + GDestroyNotify dnotify);

Sets the callback that domain will use to authenticate incoming requests. For each request containing authorization, domain will @@ -294,13 +294,13 @@

Property Details

The "auth-callback" property

-
  "auth-callback"            gpointer              : Read / Write
+
  "auth-callback"            gpointer              : Read / Write

Password-finding callback.

The "auth-data" property

-
  "auth-data"                gpointer              : Read / Write
+
  "auth-data"                gpointer              : Read / Write

Data to pass to authentication callback.

diff -Nru libsoup2.4-2.30.1/docs/reference/html/SoupAuthDomain.html libsoup2.4-2.30.2/docs/reference/html/SoupAuthDomain.html --- libsoup2.4-2.30.1/docs/reference/html/SoupAuthDomain.html 2010-04-26 21:56:18.000000000 +0100 +++ libsoup2.4-2.30.2/docs/reference/html/SoupAuthDomain.html 2010-06-22 18:08:01.000000000 +0100 @@ -50,31 +50,31 @@ const char *path); voidsoup_auth_domain_remove_path (SoupAuthDomain *domain, const char *path); -gboolean (*SoupAuthDomainFilter) (SoupAuthDomain *domain, +gboolean (*SoupAuthDomainFilter) (SoupAuthDomain *domain, SoupMessage *msg, - gpointer user_data); + gpointer user_data); voidsoup_auth_domain_set_filter (SoupAuthDomain *domain, SoupAuthDomainFilter filter, - gpointer filter_data, - GDestroyNotify dnotify); + gpointer filter_data, + GDestroyNotify dnotify); const char * soup_auth_domain_get_realm (SoupAuthDomain *domain); -gboolean (*SoupAuthDomainGenericAuthCallback) +gboolean (*SoupAuthDomainGenericAuthCallback) (SoupAuthDomain *domain, SoupMessage *msg, const char *username, - gpointer user_data); + gpointer user_data); voidsoup_auth_domain_set_generic_auth_callback (SoupAuthDomain *domain, SoupAuthDomainGenericAuthCallback auth_callback, - gpointer auth_data, - GDestroyNotify dnotify); -gbooleansoup_auth_domain_check_password (SoupAuthDomain *domain, + gpointer auth_data, + GDestroyNotify dnotify); +gbooleansoup_auth_domain_check_password (SoupAuthDomain *domain, SoupMessage *msg, const char *username, const char *password); -gbooleansoup_auth_domain_covers (SoupAuthDomain *domain, +gbooleansoup_auth_domain_covers (SoupAuthDomain *domain, SoupMessage *msg); char * soup_auth_domain_accepts (SoupAuthDomain *domain, SoupMessage *msg); @@ -94,7 +94,7 @@

Object Hierarchy

-  GObject
+  GObject
    +----SoupAuthDomain
          +----SoupAuthDomainBasic
          +----SoupAuthDomainDigest
@@ -103,14 +103,14 @@
 

 
Properties

 
-  "add-path"                 gchar*                : Write
-  "filter"                   gpointer              : Read / Write
-  "filter-data"              gpointer              : Read / Write
-  "generic-auth-callback"    gpointer              : Read / Write
-  "generic-auth-data"        gpointer              : Read / Write
-  "proxy"                    gboolean              : Read / Write / Construct Only
-  "realm"                    gchar*                : Read / Write / Construct Only
-  "remove-path"              gchar*                : Write
+  "add-path"                 gchar*                : Write
+  "filter"                   gpointer              : Read / Write
+  "filter-data"              gpointer              : Read / Write
+  "generic-auth-callback"    gpointer              : Read / Write
+  "generic-auth-data"        gpointer              : Read / Write
+  "proxy"                    gboolean              : Read / Write / Construct Only
+  "realm"                    gchar*                : Read / Write / Construct Only
+  "remove-path"              gchar*                : Write
 

 

 

@@ -218,9 +218,9 @@
 

 

 
SoupAuthDomainFilter ()

-
gboolean            (*SoupAuthDomainFilter)             (SoupAuthDomain *domain,
+
gboolean            (*SoupAuthDomainFilter)             (SoupAuthDomain *domain,
                                                          SoupMessage *msg,
-                                                         gpointer user_data);

+                                                         gpointer user_data);

 

 The prototype for a SoupAuthDomain filter; see
 soup_auth_domain_set_filter() for details.
@@ -245,7 +245,7 @@
- @@ -256,8 +256,8 @@

soup_auth_domain_set_filter ()

void                soup_auth_domain_set_filter         (SoupAuthDomain *domain,
                                                          SoupAuthDomainFilter filter,
-                                                         gpointer filter_data,
-                                                         GDestroyNotify dnotify);
+ gpointer filter_data, + GDestroyNotify dnotify);

Adds filter as an authentication filter to domain. The filter gets a chance to bypass authentication for certain requests that @@ -266,18 +266,18 @@ it might check the message's method, and allow GETs but not PUTs.

-The filter function returns TRUE if the request should still -require authentication, or FALSE if authentication is unnecessary +The filter function returns TRUE if the request should still +require authentication, or FALSE if authentication is unnecessary for this request.

-To help prevent security holes, your filter should return TRUE by -default, and only return FALSE under specifically-tested +To help prevent security holes, your filter should return TRUE by +default, and only return FALSE under specifically-tested circumstances, rather than the other way around. Eg, in the example above, where you want to authenticate PUTs but not GETs, you should -check if the method is GET and return FALSE in that case, and then -return TRUE for all other methods (rather than returning TRUE for -PUT and FALSE for all other methods). This way if it turned out +check if the method is GET and return FALSE in that case, and then +return TRUE for all other methods (rather than returning TRUE for +PUT and FALSE for all other methods). This way if it turned out (now or later) that some paths supported additional methods besides GET and PUT, those methods would default to being NOT allowed for unauthenticated users. @@ -340,11 +340,11 @@

SoupAuthDomainGenericAuthCallback ()

-
gboolean            (*SoupAuthDomainGenericAuthCallback)
+
gboolean            (*SoupAuthDomainGenericAuthCallback)
                                                         (SoupAuthDomain *domain,
                                                          SoupMessage *msg,
                                                          const char *username,
-                                                         gpointer user_data);

+                                                         gpointer user_data);

The prototype for a SoupAuthDomain generic authentication callback.

@@ -391,7 +391,7 @@
- @@ -403,8 +403,8 @@ 
void                soup_auth_domain_set_generic_auth_callback
                                                         (SoupAuthDomain *domain,
                                                          SoupAuthDomainGenericAuthCallback auth_callback,
-                                                         gpointer auth_data,
-                                                         GDestroyNotify dnotify);
+ gpointer auth_data, + GDestroyNotify dnotify);

Sets auth_callback as an authentication-handling callback for domain. Whenever a request comes in to domain which cannot be @@ -443,7 +443,7 @@

soup_auth_domain_check_password ()

-
gboolean            soup_auth_domain_check_password     (SoupAuthDomain *domain,
+
gboolean            soup_auth_domain_check_password     (SoupAuthDomain *domain,
                                                          SoupMessage *msg,
                                                          const char *username,
                                                          const char *password);

@@ -486,7 +486,7 @@
 

 

 
soup_auth_domain_covers ()

-
gboolean            soup_auth_domain_covers             (SoupAuthDomain *domain,
+
gboolean            soup_auth_domain_covers             (SoupAuthDomain *domain,
                                                          SoupMessage *msg);

 

 Checks if domain requires msg to be authenticated (according to
@@ -513,7 +513,7 @@
- @@ -550,7 +550,7 @@ @@ -671,52 +671,52 @@

Property Details

The "add-path" property

-
  "add-path"                 gchar*                : Write
+
  "add-path"                 gchar*                : Write

Add a path covered by this auth domain.

Default value: NULL

The "filter" property

-
  "filter"                   gpointer              : Read / Write
+
  "filter"                   gpointer              : Read / Write

A filter for deciding whether or not to require authentication.

The "filter-data" property

-
  "filter-data"              gpointer              : Read / Write
+
  "filter-data"              gpointer              : Read / Write

Data to pass to filter.

The "generic-auth-callback" property

-
  "generic-auth-callback"    gpointer              : Read / Write
+
  "generic-auth-callback"    gpointer              : Read / Write

An authentication callback that can be used with any SoupAuthDomain subclass.

The "generic-auth-data" property

-
  "generic-auth-data"        gpointer              : Read / Write
+
  "generic-auth-data"        gpointer              : Read / Write

Data to pass to auth callback.

The "proxy" property

-
  "proxy"                    gboolean              : Read / Write / Construct Only
+
  "proxy"                    gboolean              : Read / Write / Construct Only

Whether or not this is a proxy auth domain.

Default value: FALSE

The "realm" property

-
  "realm"                    gchar*                : Read / Write / Construct Only
+
  "realm"                    gchar*                : Read / Write / Construct Only

The realm of this auth domain.

Default value: NULL

The "remove-path" property

-
  "remove-path"              gchar*                : Write
+
  "remove-path"              gchar*                : Write

Remove a path covered by this auth domain.

Default value: NULL

diff -Nru libsoup2.4-2.30.1/docs/reference/html/SoupAuth.html libsoup2.4-2.30.2/docs/reference/html/SoupAuth.html --- libsoup2.4-2.30.1/docs/reference/html/SoupAuth.html 2010-04-26 21:56:18.000000000 +0100 +++ libsoup2.4-2.30.2/docs/reference/html/SoupAuth.html 2010-06-22 18:08:01.000000000 +0100 @@ -47,14 +47,14 @@ #include <libsoup/soup.h> SoupAuth; -SoupAuth * soup_auth_new (GType type, +SoupAuth * soup_auth_new (GType type, SoupMessage *msg, const char *auth_header); -gbooleansoup_auth_update (SoupAuth *auth, +gbooleansoup_auth_update (SoupAuth *auth, SoupMessage *msg, const char *auth_header); -gbooleansoup_auth_is_for_proxy (SoupAuth *auth); +gbooleansoup_auth_is_for_proxy (SoupAuth *auth); const char * soup_auth_get_scheme_name (SoupAuth *auth); const char * soup_auth_get_host (SoupAuth *auth); const char * soup_auth_get_realm (SoupAuth *auth); @@ -63,14 +63,14 @@ voidsoup_auth_authenticate (SoupAuth *auth, const char *username, const char *password); -gbooleansoup_auth_is_authenticated (SoupAuth *auth); +gbooleansoup_auth_is_authenticated (SoupAuth *auth); char * soup_auth_get_authorization (SoupAuth *auth, SoupMessage *msg); -GSList * soup_auth_get_protection_space (SoupAuth *auth, +GSList * soup_auth_get_protection_space (SoupAuth *auth, SoupURI *source_uri); voidsoup_auth_free_protection_space (SoupAuth *auth, - GSList *space); + GSList *space); #define SOUP_AUTH_SCHEME_NAME #define SOUP_AUTH_REALM @@ -82,18 +82,18 @@

Object Hierarchy

-  GObject
+  GObject
    +----SoupAuth

Properties

-  "host"                     gchar*                : Read / Write / Construct Only
-  "is-authenticated"         gboolean              : Read
-  "is-for-proxy"             gboolean              : Read / Write / Construct Only
-  "realm"                    gchar*                : Read / Write / Construct Only
-  "scheme-name"              gchar*                : Read
+  "host"                     gchar*                : Read / Write / Construct Only
+  "is-authenticated"         gboolean              : Read
+  "is-for-proxy"             gboolean              : Read / Write / Construct Only
+  "realm"                    gchar*                : Read / Write / Construct Only
+  "scheme-name"              gchar*                : Read
@@ -125,7 +125,7 @@

soup_auth_new ()

-
SoupAuth *          soup_auth_new                       (GType type,
+
SoupAuth *          soup_auth_new                       (GType type,
                                                          SoupMessage *msg,
                                                          const char *auth_header);

 

@@ -156,7 +156,7 @@
- @@ -166,7 +166,7 @@

soup_auth_update ()

-
gboolean            soup_auth_update                    (SoupAuth *auth,
+
gboolean            soup_auth_update                    (SoupAuth *auth,
                                                          SoupMessage *msg,
                                                          const char *auth_header);

 

@@ -194,8 +194,8 @@
- @@ -205,7 +205,7 @@

soup_auth_is_for_proxy ()

-
gboolean            soup_auth_is_for_proxy              (SoupAuth *auth);
+
gboolean            soup_auth_is_for_proxy              (SoupAuth *auth);

Tests whether or not auth is associated with a proxy server rather than an "origin" server. @@ -220,7 +220,7 @@

- @@ -362,7 +362,7 @@

soup_auth_is_authenticated ()

-
gboolean            soup_auth_is_authenticated          (SoupAuth *auth);
+
gboolean            soup_auth_is_authenticated          (SoupAuth *auth);

Tests if auth has been given a username and password

@@ -376,7 +376,7 @@
- @@ -390,7 +390,7 @@

Generates an appropriate "Authorization" header for msg. (The session will only call this if soup_auth_is_authenticated() -returned TRUE.) +returned TRUE.)

optname1 :

name of first option, or NULL +name of first option, or NULL

Returns :

 TRUE if username and password are valid + TRUE if username and password are valid

optname1 :

name of first option, or NULL +name of first option, or NULL

Returns :

 the encoded password, or NULL if username is not a + the encoded password, or NULL if username is not a valid user. domain will free the password when it is done with it.

Returns :

 TRUE if msg requires authentication, FALSE if not. + TRUE if msg requires authentication, FALSE if not.

Returns :

 TRUE if msg is authenticated, FALSE if not. + TRUE if msg is authenticated, FALSE if not.

Returns :

 TRUE if domain requires msg to be authenticated + TRUE if domain requires msg to be authenticated

Returns :

 the username that msg has authenticated as, if in -fact it has authenticated. NULL otherwise. +fact it has authenticated. NULL otherwise.

Returns :

 the new SoupAuth, or NULL if it could not be + the new SoupAuth, or NULL if it could not be created

Returns :

 TRUE if auth is still a valid (but potentially -unauthenticated) SoupAuth. FALSE if something about auth_params + TRUE if auth is still a valid (but potentially +unauthenticated) SoupAuth. FALSE if something about auth_params could not be parsed or incorporated into auth at all.

Returns :

 TRUE or FALSE + TRUE or FALSE

Returns :

 TRUE if auth has been given a username and password + TRUE if auth has been given a username and password
@@ -416,7 +416,7 @@

soup_auth_get_protection_space ()

-
GSList *            soup_auth_get_protection_space      (SoupAuth *auth,
+
GSList *            soup_auth_get_protection_space      (SoupAuth *auth,
                                                          SoupURI *source_uri);

 

 Returns a list of paths on the server which auth extends over.
@@ -440,8 +440,8 @@
- @@ -451,7 +451,7 @@

soup_auth_free_protection_space ()

void                soup_auth_free_protection_space     (SoupAuth *auth,
-                                                         GSList *space);
+ GSList *space);

Frees space.

@@ -526,35 +526,35 @@

Property Details

The "host" property

-
  "host"                     gchar*                : Read / Write / Construct Only
+
  "host"                     gchar*                : Read / Write / Construct Only

Authentication host.

Default value: NULL

The "is-authenticated" property

-
  "is-authenticated"         gboolean              : Read
+
  "is-authenticated"         gboolean              : Read

Whether or not the auth is authenticated.

Default value: FALSE

The "is-for-proxy" property

-
  "is-for-proxy"             gboolean              : Read / Write / Construct Only
+
  "is-for-proxy"             gboolean              : Read / Write / Construct Only

Whether or not the auth is for a proxy server.

Default value: FALSE

The "realm" property

-
  "realm"                    gchar*                : Read / Write / Construct Only
+
  "realm"                    gchar*                : Read / Write / Construct Only

Authentication realm.

Default value: NULL

The "scheme-name" property

-
  "scheme-name"              gchar*                : Read
+
  "scheme-name"              gchar*                : Read

Authentication scheme name.

Default value: NULL

@@ -564,9 +564,9 @@

The "save-password" signal

void                user_function                      (SoupAuth *auth,
-                                                        gchar    *username,
-                                                        gchar    *password,
-                                                        gpointer  user_data)      : Run First
+ gchar *username, + gchar *password, + gpointer user_data) : Run First

Emitted to request that the username/password pair be saved. If the session supports password-saving, it will diff -Nru libsoup2.4-2.30.1/docs/reference/html/SoupContentSniffer.html libsoup2.4-2.30.2/docs/reference/html/SoupContentSniffer.html --- libsoup2.4-2.30.1/docs/reference/html/SoupContentSniffer.html 2010-04-26 21:56:18.000000000 +0100 +++ libsoup2.4-2.30.2/docs/reference/html/SoupContentSniffer.html 2010-06-22 18:08:00.000000000 +0100 @@ -49,13 +49,13 @@ char * soup_content_sniffer_sniff (SoupContentSniffer *sniffer, SoupMessage *msg, SoupBuffer *buffer, - GHashTable **params); + GHashTable **params);

Object Hierarchy

-  GObject
+  GObject
    +----SoupContentSniffer
@@ -108,7 +108,7 @@ 
char *              soup_content_sniffer_sniff          (SoupContentSniffer *sniffer,
                                                          SoupMessage *msg,
                                                          SoupBuffer *buffer,
-                                                         GHashTable **params);
+ GHashTable **params);

Returns :

 the list of paths, which can be freed with -soup_auth_free_protection_space().. [element-type utf8] + the list of paths, which must be freed with +soup_auth_free_protection_space().
diff -Nru libsoup2.4-2.30.1/docs/reference/html/SoupCookieJar.html libsoup2.4-2.30.2/docs/reference/html/SoupCookieJar.html --- libsoup2.4-2.30.1/docs/reference/html/SoupCookieJar.html 2010-04-26 21:56:18.000000000 +0100 +++ libsoup2.4-2.30.2/docs/reference/html/SoupCookieJar.html 2010-06-22 18:08:01.000000000 +0100 @@ -53,7 +53,7 @@ voidsoup_cookie_jar_save (SoupCookieJar *jar); char * soup_cookie_jar_get_cookies (SoupCookieJar *jar, SoupURI *uri, - gboolean for_http); + gboolean for_http); voidsoup_cookie_jar_set_cookie (SoupCookieJar *jar, SoupURI *uri, const char *cookie); @@ -62,7 +62,7 @@ SoupCookie *cookie); voidsoup_cookie_jar_delete_cookie (SoupCookieJar *jar, SoupCookie *cookie); -GSList * soup_cookie_jar_all_cookies (SoupCookieJar *jar); +GSList * soup_cookie_jar_all_cookies (SoupCookieJar *jar); #define SOUP_COOKIE_JAR_READ_ONLY @@ -70,7 +70,7 @@

Object Hierarchy

-  GObject
+  GObject
    +----SoupCookieJar
          +----SoupCookieJarSqlite
          +----SoupCookieJarText
@@ -86,7 +86,7 @@
 
Properties

 
   "accept-policy"            SoupCookieJarAcceptPolicy  : Read / Write
-  "read-only"                gboolean              : Read / Write / Construct Only
+  "read-only"                gboolean              : Read / Write / Construct Only
@@ -160,18 +160,18 @@

soup_cookie_jar_get_cookies ()

char *              soup_cookie_jar_get_cookies         (SoupCookieJar *jar,
                                                          SoupURI *uri,
-                                                         gboolean for_http);
+ gboolean for_http);

Retrieves (in Cookie-header form) the list of cookies that would be sent with a request to uri.

-If for_http is TRUE, the return value will include cookies marked +If for_http is TRUE, the return value will include cookies marked "HttpOnly" (that is, cookies that the server wishes to keep hidden from client-side scripting operations such as the JavaScript document.cookies property). Since SoupCookieJar sets the Cookie header itself when making the actual HTTP request, you should -almost certainly be setting for_http to FALSE if you are calling +almost certainly be setting for_http to FALSE if you are calling this.

@@ -195,7 +195,7 @@ - @@ -301,9 +301,9 @@

soup_cookie_jar_all_cookies ()

-
GSList *            soup_cookie_jar_all_cookies         (SoupCookieJar *jar);
+
GSList *            soup_cookie_jar_all_cookies         (SoupCookieJar *jar);

-Constructs a GSList with every cookie inside the jar. +Constructs a GSList with every cookie inside the jar. The cookies in the list are a copy of the original, so you have to free them when you are done with them.

@@ -317,7 +317,7 @@
- @@ -347,7 +347,7 @@

The "read-only" property

-
  "read-only"                gboolean              : Read / Write / Construct Only
+
  "read-only"                gboolean              : Read / Write / Construct Only

Whether or not the cookie jar is read-only.

Default value: FALSE

@@ -359,13 +359,13 @@ 
void                user_function                      (SoupCookieJar *jar,
                                                         SoupCookie    *old_cookie,
                                                         SoupCookie    *new_cookie,
-                                                        gpointer       user_data)       : Run First
+ gpointer user_data) : Run First

Emitted when jar changes. If a cookie has been added, new_cookie will contain the newly-added cookie and -old_cookie will be NULL. If a cookie has been deleted, +old_cookie will be NULL. If a cookie has been deleted, old_cookie will contain the to-be-deleted cookie and -new_cookie will be NULL. If a cookie has been changed, +new_cookie will be NULL. If a cookie has been changed, old_cookie will contain its old value, and new_cookie its new value.

diff -Nru libsoup2.4-2.30.1/docs/reference/html/SoupCookieJarSqlite.html libsoup2.4-2.30.2/docs/reference/html/SoupCookieJarSqlite.html --- libsoup2.4-2.30.1/docs/reference/html/SoupCookieJarSqlite.html 2010-04-26 21:56:18.000000000 +0100 +++ libsoup2.4-2.30.2/docs/reference/html/SoupCookieJarSqlite.html 2010-06-22 18:08:01.000000000 +0100 @@ -48,7 +48,7 @@ SoupCookieJarSqlite; SoupCookieJar * soup_cookie_jar_sqlite_new (const char *filename, - gboolean read_only); + gboolean read_only); #define SOUP_COOKIE_JAR_SQLITE_FILENAME @@ -56,7 +56,7 @@

Object Hierarchy

-  GObject
+  GObject
    +----SoupCookieJar
          +----SoupCookieJarSqlite
@@ -70,7 +70,7 @@

Properties

-  "filename"                 gchar*                : Read / Write / Construct Only
+  "filename"                 gchar*                : Read / Write / Construct Only
@@ -92,15 +92,15 @@

soup_cookie_jar_sqlite_new ()

SoupCookieJar *     soup_cookie_jar_sqlite_new          (const char *filename,
-                                                         gboolean read_only);
+ gboolean read_only);

Creates a SoupCookieJarSqlite.

filename will be read in at startup to create an initial set of -cookies. If read_only is FALSE, then the non-session cookies will +cookies. If read_only is FALSE, then the non-session cookies will be written to filename when the 'changed' signal is emitted from -the jar. (If read_only is TRUE, then the cookie jar will only be +the jar. (If read_only is TRUE, then the cookie jar will only be used for this session, and changes made to it will be lost when the jar is destroyed.)

@@ -109,13 +109,13 @@
- @@ -143,7 +143,7 @@

Property Details

The "filename" property

-
  "filename"                 gchar*                : Read / Write / Construct Only
+
  "filename"                 gchar*                : Read / Write / Construct Only

Cookie-storage filename.

Default value: NULL

diff -Nru libsoup2.4-2.30.1/docs/reference/html/SoupCookieJarText.html libsoup2.4-2.30.2/docs/reference/html/SoupCookieJarText.html --- libsoup2.4-2.30.1/docs/reference/html/SoupCookieJarText.html 2010-04-26 21:56:18.000000000 +0100 +++ libsoup2.4-2.30.2/docs/reference/html/SoupCookieJarText.html 2010-06-22 18:08:01.000000000 +0100 @@ -48,7 +48,7 @@ SoupCookieJarText; SoupCookieJar * soup_cookie_jar_text_new (const char *filename, - gboolean read_only); + gboolean read_only); #define SOUP_COOKIE_JAR_TEXT_FILENAME @@ -56,7 +56,7 @@

Object Hierarchy

-  GObject
+  GObject
    +----SoupCookieJar
          +----SoupCookieJarText
@@ -70,7 +70,7 @@

Properties

-  "filename"                 gchar*                : Read / Write / Construct Only
+  "filename"                 gchar*                : Read / Write / Construct Only
@@ -92,15 +92,15 @@

soup_cookie_jar_text_new ()

SoupCookieJar *     soup_cookie_jar_text_new            (const char *filename,
-                                                         gboolean read_only);
+ gboolean read_only);

Creates a SoupCookieJarText.

filename will be read in at startup to create an initial set of -cookies. If read_only is FALSE, then the non-session cookies will +cookies. If read_only is FALSE, then the non-session cookies will be written to filename when the 'changed' signal is emitted from -the jar. (If read_only is TRUE, then the cookie jar will only be +the jar. (If read_only is TRUE, then the cookie jar will only be used for this session, and changes made to it will be lost when the jar is destroyed.)

@@ -115,7 +115,7 @@
@@ -143,7 +143,7 @@

Property Details

The "filename" property

-
  "filename"                 gchar*                : Read / Write / Construct Only
+
  "filename"                 gchar*                : Read / Write / Construct Only

Cookie-storage filename.

Default value: NULL

diff -Nru libsoup2.4-2.30.1/docs/reference/html/SoupLogger.html libsoup2.4-2.30.2/docs/reference/html/SoupLogger.html --- libsoup2.4-2.30.1/docs/reference/html/SoupLogger.html 2010-04-26 21:56:18.000000000 +0100 +++ libsoup2.4-2.30.2/docs/reference/html/SoupLogger.html 2010-06-22 18:08:01.000000000 +0100 @@ -55,31 +55,31 @@ SoupLoggerLogLevel (*SoupLoggerFilter) (SoupLogger *logger, SoupMessage *msg, - gpointer user_data); + gpointer user_data); voidsoup_logger_set_request_filter (SoupLogger *logger, SoupLoggerFilter request_filter, - gpointer filter_data, - GDestroyNotify destroy); + gpointer filter_data, + GDestroyNotify destroy); voidsoup_logger_set_response_filter (SoupLogger *logger, SoupLoggerFilter response_filter, - gpointer filter_data, - GDestroyNotify destroy); + gpointer filter_data, + GDestroyNotify destroy); void (*SoupLoggerPrinter) (SoupLogger *logger, SoupLoggerLogLevel level, char direction, const char *data, - gpointer user_data); + gpointer user_data); voidsoup_logger_set_printer (SoupLogger *logger, SoupLoggerPrinter printer, - gpointer printer_data, - GDestroyNotify destroy); + gpointer printer_data, + GDestroyNotify destroy);

Object Hierarchy

-  GObject
+  GObject
    +----SoupLogger
@@ -309,7 +309,7 @@

SoupLoggerFilter ()

SoupLoggerLogLevel  (*SoupLoggerFilter)                 (SoupLogger *logger,
                                                          SoupMessage *msg,
-                                                         gpointer user_data);
+ gpointer user_data);

The prototype for a logging filter. The filter callback will be invoked for each request or response, and should analyze it and @@ -350,8 +350,8 @@

soup_logger_set_request_filter ()

void                soup_logger_set_request_filter      (SoupLogger *logger,
                                                          SoupLoggerFilter request_filter,
-                                                         gpointer filter_data,
-                                                         GDestroyNotify destroy);
+ gpointer filter_data, + GDestroyNotify destroy);

Sets up a filter to determine the log level for a given request. For each HTTP request logger will invoke request_filter to @@ -379,7 +379,7 @@

- @@ -390,8 +390,8 @@

soup_logger_set_response_filter ()

void                soup_logger_set_response_filter     (SoupLogger *logger,
                                                          SoupLoggerFilter response_filter,
-                                                         gpointer filter_data,
-                                                         GDestroyNotify destroy);
+ gpointer filter_data, + GDestroyNotify destroy);

Sets up a filter to determine the log level for a given response. For each HTTP response logger will invoke response_filter to @@ -419,7 +419,7 @@

- @@ -432,7 +432,7 @@ SoupLoggerLogLevel level, char direction, const char *data, - gpointer user_data); + gpointer user_data);

The prototype for a custom printing callback.

@@ -498,8 +498,8 @@

soup_logger_set_printer ()

void                soup_logger_set_printer             (SoupLogger *logger,
                                                          SoupLoggerPrinter printer,
-                                                         gpointer printer_data,
-                                                         GDestroyNotify destroy);
+ gpointer printer_data, + GDestroyNotify destroy);

Sets up an alternate log printing routine, if you don't want the log to go to stdout. @@ -524,7 +524,7 @@

- diff -Nru libsoup2.4-2.30.1/docs/reference/html/SoupMessage.html libsoup2.4-2.30.2/docs/reference/html/SoupMessage.html --- libsoup2.4-2.30.1/docs/reference/html/SoupMessage.html 2010-04-26 21:56:18.000000000 +0100 +++ libsoup2.4-2.30.2/docs/reference/html/SoupMessage.html 2010-06-22 18:08:01.000000000 +0100 @@ -56,12 +56,12 @@ const char *content_type, SoupMemoryUse req_use, const char *req_body, - gsize req_length); + gsize req_length); voidsoup_message_set_response (SoupMessage *msg, const char *content_type, SoupMemoryUse resp_use, const char *resp_body, - gsize resp_length); + gsize resp_length); enum SoupHTTPVersion; voidsoup_message_set_http_version (SoupMessage *msg, @@ -73,38 +73,38 @@ SoupAddress * soup_message_get_address (SoupMessage *msg); voidsoup_message_set_status (SoupMessage *msg, - guint status_code); + guint status_code); voidsoup_message_set_status_full (SoupMessage *msg, - guint status_code, + guint status_code, const char *reason_phrase); -gbooleansoup_message_is_keepalive (SoupMessage *msg); +gbooleansoup_message_is_keepalive (SoupMessage *msg); -guintsoup_message_add_header_handler (SoupMessage *msg, +guintsoup_message_add_header_handler (SoupMessage *msg, const char *signal, const char *header, - GCallback callback, - gpointer user_data); -guintsoup_message_add_status_code_handler + GCallback callback, + gpointer user_data); +guintsoup_message_add_status_code_handler (SoupMessage *msg, const char *signal, - guint status_code, - GCallback callback, - gpointer user_data); + guint status_code, + GCallback callback, + gpointer user_data); enum SoupMessageFlags; voidsoup_message_set_flags (SoupMessage *msg, SoupMessageFlags flags); SoupMessageFlagssoup_message_get_flags (SoupMessage *msg); SoupBuffer * (*SoupChunkAllocator) (SoupMessage *msg, - gsize max_len, - gpointer user_data); + gsize max_len, + gpointer user_data); voidsoup_message_set_chunk_allocator (SoupMessage *msg, SoupChunkAllocator allocator, - gpointer user_data, - GDestroyNotify destroy_notify); + gpointer user_data, + GDestroyNotify destroy_notify); voidsoup_message_disable_feature (SoupMessage *msg, - GType feature_type); + GType feature_type); #define SOUP_MESSAGE_METHOD #define SOUP_MESSAGE_URI @@ -118,7 +118,7 @@

Object Hierarchy

-  GObject
+  GObject
    +----SoupMessage
@@ -128,10 +128,10 @@ "first-party" SoupURI* : Read / Write "flags" SoupMessageFlags : Read / Write "http-version" SoupHTTPVersion : Read / Write - "method" gchar* : Read / Write - "reason-phrase" gchar* : Read / Write - "server-side" gboolean : Read / Write / Construct Only - "status-code" guint : Read / Write + "method" gchar* : Read / Write + "reason-phrase" gchar* : Read / Write + "server-side" gboolean : Read / Write / Construct Only + "status-code" guint : Read / Write "uri" SoupURI* : Read / Write @@ -231,7 +231,7 @@ are handling the data from a "got_chunk", and so don't need to see it all at the end), call soup_message_body_set_accumulate() on response_body or -request_body as appropriate, passing FALSE. +request_body as appropriate, passing FALSE.

Returns :

 the cookies, in string form, or NULL if there are no + the cookies, in string form, or NULL if there are no cookies for uri.

Returns :

 a GSList with all the cookies in the jar. + a GSList with all the cookies in the jar.

filename :

the filename to read to/write from, or NULL +the filename to read to/write from, or NULL

read_only :

 -TRUE if filename is read-only +TRUE if filename is read-only

read_only :

 -TRUE if filename is read-only +TRUE if filename is read-only

destroy :

a GDestroyNotify to free filter_data +a GDestroyNotify to free filter_data

destroy :

a GDestroyNotify to free filter_data +a GDestroyNotify to free filter_data

destroy :

a GDestroyNotify to free printer_data +a GDestroyNotify to free printer_data
@@ -242,7 +242,7 @@ - + @@ -297,7 +297,7 @@ - @@ -340,10 +340,10 @@ const char *content_type, SoupMemoryUse req_use, const char *req_body, - gsize req_length); + gsize req_length);

Convenience function to set the request body of a SoupMessage. If -content_type is NULL, the request body must be empty as well. +content_type is NULL, the request body must be empty as well.

guint status_code;

guint status_code;

 the HTTP status code

Returns :

 the new SoupMessage (or NULL if uri could not + the new SoupMessage (or NULL if uri could not be parsed).
@@ -383,10 +383,10 @@ const char *content_type, SoupMemoryUse resp_use, const char *resp_body, - gsize resp_length); + gsize resp_length);

Convenience function to set the response body of a SoupMessage. If -content_type is NULL, the response body must be empty as well. +content_type is NULL, the response body must be empty as well.

@@ -398,7 +398,7 @@ - @@ -408,8 +408,7 @@ - @@ -577,7 +576,7 @@

soup_message_set_status ()

void                soup_message_set_status             (SoupMessage *msg,
-                                                         guint status_code);
+ guint status_code);

Sets msg's status code to status_code. If status_code is a known value, it will also set msg's reason_phrase. @@ -602,7 +601,7 @@

soup_message_set_status_full ()

void                soup_message_set_status_full        (SoupMessage *msg,
-                                                         guint status_code,
+                                                         guint status_code,
                                                          const char *reason_phrase);

Sets msg's status code and reason phrase. @@ -631,7 +630,7 @@

soup_message_is_keepalive ()

-
gboolean            soup_message_is_keepalive           (SoupMessage *msg);
+
gboolean            soup_message_is_keepalive           (SoupMessage *msg);

Determines whether or not msg's connection can be kept alive for further requests after processing msg, based on the HTTP version, @@ -647,7 +646,7 @@

- @@ -656,14 +655,14 @@

soup_message_add_header_handler ()

-
guint               soup_message_add_header_handler     (SoupMessage *msg,
+
guint               soup_message_add_header_handler     (SoupMessage *msg,
                                                          const char *signal,
                                                          const char *header,
-                                                         GCallback callback,
-                                                         gpointer user_data);

+                                                         GCallback callback,
+                                                         gpointer user_data);

Adds a signal handler to msg for signal, as with -g_signal_connect(), but with two differences: the callback will +g_signal_connect(), but with two differences: the callback will only be run if msg has a header named header, and it will only be run if no earlier handler cancelled or requeued the message.

@@ -705,7 +704,7 @@
- @@ -714,15 +713,15 @@

soup_message_add_status_code_handler ()

-
guint               soup_message_add_status_code_handler
+
guint               soup_message_add_status_code_handler
                                                         (SoupMessage *msg,
                                                          const char *signal,
-                                                         guint status_code,
-                                                         GCallback callback,
-                                                         gpointer user_data);

+                                                         guint status_code,
+                                                         GCallback callback,
+                                                         gpointer user_data);

Adds a signal handler to msg for signal, as with -g_signal_connect() but with two differences: the callback will +g_signal_connect() but with two differences: the callback will only be run if msg has the status status_code, and it will only be run if no earlier handler cancelled or requeued the message.

@@ -762,7 +761,7 @@
- @@ -797,7 +796,7 @@ @@ -810,7 +809,7 @@ - @@ -869,8 +868,8 @@

SoupChunkAllocator ()

SoupBuffer *        (*SoupChunkAllocator)               (SoupMessage *msg,
-                                                         gsize max_len,
-                                                         gpointer user_data);
+ gsize max_len, + gpointer user_data);

The prototype for a chunk allocation callback. This should allocate a new SoupBuffer and return it for the I/O layer to read message @@ -886,7 +885,7 @@ convenient.

-If the allocator returns NULL, the message will be paused. It is +If the allocator returns NULL, the message will be paused. It is up to the application to make sure that it gets unpaused when it becomes possible to allocate a new buffer.

@@ -910,7 +909,7 @@
- @@ -921,8 +920,8 @@

soup_message_set_chunk_allocator ()

void                soup_message_set_chunk_allocator    (SoupMessage *msg,
                                                          SoupChunkAllocator allocator,
-                                                         gpointer user_data,
-                                                         GDestroyNotify destroy_notify);
+ gpointer user_data, + GDestroyNotify destroy_notify);

Sets an alternate chunk-allocation function to use when reading msg's body. Every time data is available to read, libsoup will @@ -933,7 +932,7 @@

Generally, a custom chunk allocator would be used in conjunction -with soup_message_body_set_accumulate() FALSE and +with soup_message_body_set_accumulate() FALSE and "got_chunk", as part of a strategy to avoid unnecessary copying of data. However, you cannot assume that every call to the allocator will be followed by a call to your got_chunk handler; if @@ -982,7 +981,7 @@

soup_message_disable_feature ()

void                soup_message_disable_feature        (SoupMessage *msg,
-                                                         GType feature_type);
+ GType feature_type);

This disables the actions of SoupSessionFeatures with the given feature_type (or a subclass of that type) on msg, so that @@ -1008,7 +1007,7 @@

- @@ -1081,7 +1080,7 @@ 
#define SOUP_MESSAGE_SERVER_SIDE   "server-side"

-Alias for the "server-side" property. (TRUE if +Alias for the "server-side" property. (TRUE if the message was created by SoupServer.)

@@ -1109,28 +1108,28 @@

The "method" property

-
  "method"                   gchar*                : Read / Write
+
  "method"                   gchar*                : Read / Write

The message's HTTP method.

Default value: "GET"

The "reason-phrase" property

-
  "reason-phrase"            gchar*                : Read / Write
+
  "reason-phrase"            gchar*                : Read / Write

The HTTP response reason phrase.

Default value: NULL

The "server-side" property

-
  "server-side"              gboolean              : Read / Write / Construct Only
+
  "server-side"              gboolean              : Read / Write / Construct Only

Whether or not the message is server-side rather than client-side.

Default value: FALSE

The "status-code" property

-
  "status-code"              guint                 : Read / Write
+
  "status-code"              guint                 : Read / Write

The HTTP response status code.

Allowed values: <= 599

Default value: 0

@@ -1147,16 +1146,16 @@

The "content-sniffed" signal

void                user_function                      (SoupMessage *msg,
-                                                        gchar       *type,
-                                                        GHashTable  *params,
-                                                        gpointer     user_data)      : Run First
+ gchar *type, + GHashTable *params, + gpointer user_data) : Run First

This signal is emitted after got-headers, and before the first got-chunk. If content sniffing is disabled, or no content sniffing will be performed, due to the sniffer deciding to trust the Content-Type sent by the server, this signal is emitted immediately after got_headers, and type -is NULL. +is NULL.

If the SoupContentSniffer feature is enabled, and the @@ -1187,7 +1186,7 @@

- @@ -1202,7 +1201,7 @@

The "finished" signal

void                user_function                      (SoupMessage *msg,
-                                                        gpointer     user_data)      : Run First
+ gpointer user_data) : Run First

Emitted when all HTTP processing is finished for a message. (After "got_body" for client-side messages, or @@ -1227,7 +1226,7 @@

The "got-body" signal

void                user_function                      (SoupMessage *msg,
-                                                        gpointer     user_data)      : Run First
+ gpointer user_data) : Run First

Emitted after receiving the complete message body. (For a server-side message, this means it has received the request @@ -1259,7 +1258,7 @@

The "got-chunk" signal

void                user_function                      (SoupMessage *msg,
                                                         SoupBuffer  *chunk,
-                                                        gpointer     user_data)      : Run First
+ gpointer user_data) : Run First

Emitted after receiving a chunk of a message body. Note that "chunk" in this context means any subpiece of the @@ -1295,7 +1294,7 @@

The "got-headers" signal

void                user_function                      (SoupMessage *msg,
-                                                        gpointer     user_data)      : Run First
+ gpointer user_data) : Run First

Emitted after receiving all message headers for a message. (For a client-side message, this is after receiving the @@ -1337,7 +1336,7 @@

The "got-informational" signal

void                user_function                      (SoupMessage *msg,
-                                                        gpointer     user_data)      : Run First
+ gpointer user_data) : Run First

Emitted after receiving a 1xx (Informational) response for a (client-side) message. The response_headers will be @@ -1369,7 +1368,7 @@

The "restarted" signal

void                user_function                      (SoupMessage *msg,
-                                                        gpointer     user_data)      : Run First
+ gpointer user_data) : Run First

Emitted when a request that was already sent once is now being sent again (eg, because the first attempt received a @@ -1395,7 +1394,7 @@

The "wrote-body" signal

void                user_function                      (SoupMessage *msg,
-                                                        gpointer     user_data)      : Run First
+ gpointer user_data) : Run First

Emitted immediately after writing the complete body for a message. (For a client-side message, this means that @@ -1424,7 +1423,7 @@

The "wrote-body-data" signal

void                user_function                      (SoupMessage *msg,
                                                         SoupBuffer  *chunk,
-                                                        gpointer     user_data)      : Run First
+ gpointer user_data) : Run First

Emitted immediately after writing a portion of the message body to the network. @@ -1459,7 +1458,7 @@

The "wrote-chunk" signal

void                user_function                      (SoupMessage *msg,
-                                                        gpointer     user_data)      : Run First
+ gpointer user_data) : Run First

Emitted immediately after writing a body chunk for a message.

@@ -1490,7 +1489,7 @@

The "wrote-headers" signal

void                user_function                      (SoupMessage *msg,
-                                                        gpointer     user_data)      : Run First
+ gpointer user_data) : Run First

Emitted immediately after writing the headers for a message. (For a client-side message, this is after writing @@ -1516,7 +1515,7 @@

The "wrote-informational" signal

void                user_function                      (SoupMessage *msg,
-                                                        gpointer     user_data)      : Run First
+ gpointer user_data) : Run First

Emitted immediately after writing a 1xx (Informational) response for a (server-side) message. diff -Nru libsoup2.4-2.30.1/docs/reference/html/SoupProxyURIResolver.html libsoup2.4-2.30.2/docs/reference/html/SoupProxyURIResolver.html --- libsoup2.4-2.30.1/docs/reference/html/SoupProxyURIResolver.html 2010-04-26 21:56:18.000000000 +0100 +++ libsoup2.4-2.30.2/docs/reference/html/SoupProxyURIResolver.html 2010-06-22 18:08:01.000000000 +0100 @@ -46,20 +46,20 @@ SoupProxyURIResolver; void (*SoupProxyURIResolverCallback) (SoupProxyURIResolver *resolver, - guint status, + guint status, SoupURI *proxy_uri, - gpointer user_data); + gpointer user_data); void soup_proxy_uri_resolver_get_proxy_uri_async (SoupProxyURIResolver *proxy_uri_resolver, SoupURI *uri, - GMainContext *async_context, - GCancellable *cancellable, + GMainContext *async_context, + GCancellable *cancellable, SoupProxyURIResolverCallback callback, - gpointer user_data); -guint soup_proxy_uri_resolver_get_proxy_uri_sync + gpointer user_data); +guint soup_proxy_uri_resolver_get_proxy_uri_sync (SoupProxyURIResolver *proxy_uri_resolver, SoupURI *uri, - GCancellable *cancellable, + GCancellable *cancellable, SoupURI **proxy_uri);

@@ -74,7 +74,7 @@

Prerequisites

SoupProxyURIResolver requires - GObject.

+ GObject.

Description

@@ -93,9 +93,9 @@

SoupProxyURIResolverCallback ()

void                (*SoupProxyURIResolverCallback)     (SoupProxyURIResolver *resolver,
-                                                         guint status,
+                                                         guint status,
                                                          SoupURI *proxy_uri,
-                                                         gpointer user_data);
+ gpointer user_data);

Callback for soup_proxy_uri_resolver_get_proxy_uri_async()

@@ -114,7 +114,7 @@
- @@ -131,10 +131,10 @@ 
void                soup_proxy_uri_resolver_get_proxy_uri_async
                                                         (SoupProxyURIResolver *proxy_uri_resolver,
                                                          SoupURI *uri,
-                                                         GMainContext *async_context,
-                                                         GCancellable *cancellable,
+                                                         GMainContext *async_context,
+                                                         GCancellable *cancellable,
                                                          SoupProxyURIResolverCallback callback,
-                                                         gpointer user_data);
+ gpointer user_data);

Asynchronously determines a proxy URI to use for msg and calls callback. @@ -154,12 +154,12 @@

- - @@ -179,15 +179,15 @@

soup_proxy_uri_resolver_get_proxy_uri_sync ()

-
guint               soup_proxy_uri_resolver_get_proxy_uri_sync
+
guint               soup_proxy_uri_resolver_get_proxy_uri_sync
                                                         (SoupProxyURIResolver *proxy_uri_resolver,
                                                          SoupURI *uri,
-                                                         GCancellable *cancellable,
+                                                         GCancellable *cancellable,
                                                          SoupURI **proxy_uri);

 

 Synchronously determines a proxy URI to use for uri. If uri
 should be sent via proxy, *proxy_uri will be set to the URI of the
-proxy, else it will be set to NULL.
+proxy, else it will be set to NULL.

content_type :

 MIME Content-Type of the body. [allow-none] +MIME Content-Type of the body

resp_body :

 a data buffer -containing the body of the message response.. [array length=resp_length][element-type uint8] +a data buffer containing the body of the message response.

Returns :

 TRUE or FALSE. + TRUE or FALSE.

Returns :

 the handler ID from g_signal_connect() + the handler ID from g_signal_connect()

Returns :

 the handler ID from g_signal_connect() + the handler ID from g_signal_connect()

SOUP_MESSAGE_OVERWRITE_CHUNKS

 Deprecated: equivalent to calling soup_message_body_set_accumulate() on the incoming message body -(ie, response_body for a client-side request), passing FALSE. +(ie, response_body for a client-side request), passing FALSE.

SOUP_MESSAGE_CERTIFICATE_TRUSTED

if TRUE after an https response +if TRUE after an https response has been received, indicates that the server's SSL certificate is trusted according to the session's CA.

Returns :

 the new buffer (or NULL) + the new buffer (or NULL)

feature_type :

the GType of a SoupSessionFeature +the GType of a SoupSessionFeature

params :

a GHashTable with the parameters +a GHashTable with the parameters

proxy_uri :

the resolved proxy URI, or NULL +the resolved proxy URI, or NULL

async_context :

the GMainContext to invoke callback in +the GMainContext to invoke callback in

cancellable :

a GCancellable, or NULL +a GCancellable, or NULL
@@ -204,7 +204,7 @@ - diff -Nru libsoup2.4-2.30.1/docs/reference/html/SoupServer.html libsoup2.4-2.30.2/docs/reference/html/SoupServer.html --- libsoup2.4-2.30.1/docs/reference/html/SoupServer.html 2010-04-26 21:56:18.000000000 +0100 +++ libsoup2.4-2.30.2/docs/reference/html/SoupServer.html 2010-06-22 18:08:01.000000000 +0100 @@ -49,25 +49,25 @@ SoupServer; SoupServer * soup_server_new (const char *optname1, ...); -gbooleansoup_server_is_https (SoupServer *server); -guintsoup_server_get_port (SoupServer *server); +gbooleansoup_server_is_https (SoupServer *server); +guintsoup_server_get_port (SoupServer *server); SoupSocket * soup_server_get_listener (SoupServer *server); voidsoup_server_run (SoupServer *server); voidsoup_server_run_async (SoupServer *server); voidsoup_server_quit (SoupServer *server); -GMainContext * soup_server_get_async_context (SoupServer *server); +GMainContext * soup_server_get_async_context (SoupServer *server); void (*SoupServerCallback) (SoupServer *server, SoupMessage *msg, const char *path, - GHashTable *query, + GHashTable *query, SoupClientContext *client, - gpointer user_data); + gpointer user_data); voidsoup_server_add_handler (SoupServer *server, const char *path, SoupServerCallback callback, - gpointer user_data, - GDestroyNotify destroy); + gpointer user_data, + GDestroyNotify destroy); voidsoup_server_remove_handler (SoupServer *server, const char *path); @@ -100,20 +100,20 @@

Object Hierarchy

-  GObject
+  GObject
    +----SoupServer

Properties

-  "async-context"            gpointer              : Read / Write / Construct Only
+  "async-context"            gpointer              : Read / Write / Construct Only
   "interface"                SoupAddress*          : Read / Write / Construct Only
-  "port"                     guint                 : Read / Write / Construct Only
-  "raw-paths"                gboolean              : Read / Write / Construct Only
-  "server-header"            gchar*                : Read / Write / Construct
-  "ssl-cert-file"            gchar*                : Read / Write / Construct Only
-  "ssl-key-file"             gchar*                : Read / Write / Construct Only
+  "port"                     guint                 : Read / Write / Construct Only
+  "raw-paths"                gboolean              : Read / Write / Construct Only
+  "server-header"            gchar*                : Read / Write / Construct
+  "ssl-cert-file"            gchar*                : Read / Write / Construct Only
+  "ssl-key-file"             gchar*                : Read / Write / Construct Only
@@ -135,7 +135,7 @@ handler by calling soup_server_add_handler(); the handler will be called to process any requests underneath the path passed to soup_server_add_handler(). (If you want all requests to go to the -same handler, just pass "/" (or NULL) for the path.) Any request +same handler, just pass "/" (or NULL) for the path.) Any request that does not match any handler will automatically be returned to the client with a 404 (Not Found) status.

@@ -162,7 +162,7 @@ calling soup_server_run_async() or soup_server_run(). SoupServer runs via the glib main loop; if you need to have a server that runs in another thread (or merely isn't bound to the default main loop), -create a GMainContext for it to use, and set that via the +create a GMainContext for it to use, and set that via the SOUP_SERVER_ASYNC_CONTEXT property.

@@ -206,7 +206,7 @@

soup_server_is_https ()

-
gboolean            soup_server_is_https                (SoupServer *server);
+
gboolean            soup_server_is_https                (SoupServer *server);

Checks whether server is running plain http or https.

@@ -225,7 +225,7 @@
- @@ -234,7 +234,7 @@

soup_server_get_port ()

-
guint               soup_server_get_port                (SoupServer *server);
+
guint               soup_server_get_port                (SoupServer *server);

Gets the TCP port that server is listening on. This is most useful when you did not request a specific port (or explicitly requested @@ -275,7 +275,7 @@

- @@ -288,7 +288,7 @@

Starts server, causing it to listen for and process incoming connections. Unlike soup_server_run_async(), this creates a -GMainLoop and runs it, and it will not return until someone calls +GMainLoop and runs it, and it will not return until someone calls soup_server_quit() to stop the server.

cancellable :

a GCancellable, or NULL +a GCancellable, or NULL

Returns :

 TRUE if server is serving https. + TRUE if server is serving https.

Returns :

 the listening socket.. [transfer none] + the listening socket.
@@ -309,7 +309,7 @@ connections.

-The server actually runs in server's GMainContext. It will not +The server actually runs in server's GMainContext. It will not actually perform any processing unless the appropriate main loop is running. In the simple case where you did not set the server's SOUP_SERVER_ASYNC_CONTEXT property, this means the server will run @@ -348,7 +348,7 @@

soup_server_get_async_context ()

-
GMainContext *      soup_server_get_async_context       (SoupServer *server);
+
GMainContext *      soup_server_get_async_context       (SoupServer *server);

Gets server's async_context. This does not add a ref to the context, so you will need to ref it yourself if you want it to @@ -364,7 +364,7 @@

- @@ -376,9 +376,9 @@ 
void                (*SoupServerCallback)               (SoupServer *server,
                                                          SoupMessage *msg,
                                                          const char *path,
-                                                         GHashTable *query,
+                                                         GHashTable *query,
                                                          SoupClientContext *client,
-                                                         gpointer user_data);
+ gpointer user_data);

A callback used to handle requests to a SoupServer. The callback will be invoked after receiving the request body; msg's method, @@ -452,8 +452,7 @@

- @@ -475,15 +474,15 @@ 
void                soup_server_add_handler             (SoupServer *server,
                                                          const char *path,
                                                          SoupServerCallback callback,
-                                                         gpointer user_data,
-                                                         GDestroyNotify destroy);
+ gpointer user_data, + GDestroyNotify destroy);

Adds a handler to server for requests under path. See the documentation for SoupServerCallback for information about how callbacks should behave.

-If path is NULL or "/", then this will be the default handler for +If path is NULL or "/", then this will be the default handler for all requests that don't have a more specific handler. Note though that if you want to handle requests to the special "*" URI, you must explicitly register a handler for "*"; the default handler @@ -499,7 +498,7 @@

- @@ -590,8 +589,7 @@ - @@ -615,8 +613,8 @@ - @@ -668,8 +666,8 @@ - @@ -694,7 +692,7 @@ - @@ -861,7 +859,7 @@

Alias for the "async-context" property. (The -server's GMainContext.) +server's GMainContext.)

@@ -870,7 +868,7 @@ 
#define SOUP_SERVER_RAW_PATHS     "raw-paths"

-Alias for the "raw-paths" property. (If TRUE, +Alias for the "raw-paths" property. (If TRUE, percent-encoding in the Request-URI path will not be automatically decoded.)

@@ -889,7 +887,7 @@

Property Details

The "async-context" property

-
  "async-context"            gpointer              : Read / Write / Construct Only
+
  "async-context"            gpointer              : Read / Write / Construct Only

The GMainContext to dispatch async I/O in.

@@ -901,7 +899,7 @@

The "port" property

-
  "port"                     guint                 : Read / Write / Construct Only
+
  "port"                     guint                 : Read / Write / Construct Only

Port to listen on.

Allowed values: <= 65536

Default value: 0

@@ -909,16 +907,16 @@

The "raw-paths" property

-
  "raw-paths"                gboolean              : Read / Write / Construct Only
+
  "raw-paths"                gboolean              : Read / Write / Construct Only

If %TRUE, percent-encoding in the Request-URI path will not be automatically decoded.

Default value: FALSE

The "server-header" property

-
  "server-header"            gchar*                : Read / Write / Construct
+
  "server-header"            gchar*                : Read / Write / Construct

-If non-NULL, the value to use for the "Server" header on +If non-NULL, the value to use for the "Server" header on SoupMessages processed by this server.

@@ -951,14 +949,14 @@

The "ssl-cert-file" property

-
  "ssl-cert-file"            gchar*                : Read / Write / Construct Only
+
  "ssl-cert-file"            gchar*                : Read / Write / Construct Only

File containing server SSL certificate.

Default value: NULL

The "ssl-key-file" property

-
  "ssl-key-file"             gchar*                : Read / Write / Construct Only
+
  "ssl-key-file"             gchar*                : Read / Write / Construct Only

File containing server SSL key.

Default value: NULL

@@ -970,7 +968,7 @@ 
void                user_function                      (SoupServer        *server,
                                                         SoupMessage       *message,
                                                         SoupClientContext *client,
-                                                        gpointer           user_data)      : Run First
+ gpointer user_data) : Run First

Emitted when processing has failed for a message; this could mean either that it could not be read (if @@ -1016,7 +1014,7 @@ 

void                user_function                      (SoupServer        *server,
                                                         SoupMessage       *message,
                                                         SoupClientContext *client,
-                                                        gpointer           user_data)      : Run First
+ gpointer user_data) : Run First

Emitted when the server has finished writing a response to a request. @@ -1052,7 +1050,7 @@ 

void                user_function                      (SoupServer        *server,
                                                         SoupMessage       *message,
                                                         SoupClientContext *client,
-                                                        gpointer           user_data)      : Run First
+ gpointer user_data) : Run First

Emitted when the server has successfully read a request. message will have all of its request-side information @@ -1093,7 +1091,7 @@ 

void                user_function                      (SoupServer        *server,
                                                         SoupMessage       *message,
                                                         SoupClientContext *client,
-                                                        gpointer           user_data)      : Run First
+ gpointer user_data) : Run First

Emitted when the server has started reading a new request. message will be completely blank; not even the diff -Nru libsoup2.4-2.30.1/docs/reference/html/SoupSessionAsync.html libsoup2.4-2.30.2/docs/reference/html/SoupSessionAsync.html --- libsoup2.4-2.30.1/docs/reference/html/SoupSessionAsync.html 2010-04-26 21:56:18.000000000 +0100 +++ libsoup2.4-2.30.2/docs/reference/html/SoupSessionAsync.html 2010-06-22 18:08:01.000000000 +0100 @@ -51,7 +51,7 @@

Object Hierarchy

-  GObject
+  GObject
    +----SoupSession
          +----SoupSessionAsync
diff -Nru libsoup2.4-2.30.1/docs/reference/html/SoupSessionFeature.html libsoup2.4-2.30.2/docs/reference/html/SoupSessionFeature.html --- libsoup2.4-2.30.1/docs/reference/html/SoupSessionFeature.html 2010-04-26 21:56:18.000000000 +0100 +++ libsoup2.4-2.30.2/docs/reference/html/SoupSessionFeature.html 2010-06-22 18:08:01.000000000 +0100 @@ -61,7 +61,7 @@

Prerequisites

SoupSessionFeature requires - GObject.

+ GObject.

Known Implementations

@@ -124,7 +124,7 @@
- + diff -Nru libsoup2.4-2.30.1/docs/reference/html/SoupSession.html libsoup2.4-2.30.2/docs/reference/html/SoupSession.html --- libsoup2.4-2.30.1/docs/reference/html/SoupSession.html 2010-04-26 21:56:18.000000000 +0100 +++ libsoup2.4-2.30.2/docs/reference/html/SoupSession.html 2010-06-22 18:08:01.000000000 +0100 @@ -50,18 +50,18 @@ void (*SoupSessionCallback) (SoupSession *session, SoupMessage *msg, - gpointer user_data); + gpointer user_data); voidsoup_session_queue_message (SoupSession *session, SoupMessage *msg, SoupSessionCallback callback, - gpointer user_data); + gpointer user_data); voidsoup_session_requeue_message (SoupSession *session, SoupMessage *msg); -guintsoup_session_send_message (SoupSession *session, +guintsoup_session_send_message (SoupSession *session, SoupMessage *msg); voidsoup_session_cancel_message (SoupSession *session, SoupMessage *msg, - guint status_code); + guint status_code); voidsoup_session_abort (SoupSession *session); voidsoup_session_pause_message (SoupSession *session, @@ -69,23 +69,23 @@ voidsoup_session_unpause_message (SoupSession *session, SoupMessage *msg); -GMainContext * soup_session_get_async_context (SoupSession *session); +GMainContext * soup_session_get_async_context (SoupSession *session); voidsoup_session_add_feature (SoupSession *session, SoupSessionFeature *feature); voidsoup_session_add_feature_by_type (SoupSession *session, - GType feature_type); + GType feature_type); voidsoup_session_remove_feature (SoupSession *session, SoupSessionFeature *feature); voidsoup_session_remove_feature_by_type (SoupSession *session, - GType feature_type); -GSList * soup_session_get_features (SoupSession *session, - GType feature_type); + GType feature_type); +GSList * soup_session_get_features (SoupSession *session, + GType feature_type); SoupSessionFeature * soup_session_get_feature (SoupSession *session, - GType feature_type); + GType feature_type); SoupSessionFeature * soup_session_get_feature_for_message (SoupSession *session, - GType feature_type, + GType feature_type, SoupMessage *msg); #define SOUP_SESSION_PROXY_URI @@ -105,7 +105,7 @@

Object Hierarchy

-  GObject
+  GObject
    +----SoupSession
          +----SoupSessionAsync
          +----SoupSessionSync
@@ -114,21 +114,21 @@
 

 
Properties

 
-  "accept-language"          gchar*                : Read / Write
-  "accept-language-auto"     gboolean              : Read / Write
+  "accept-language"          gchar*                : Read / Write
+  "accept-language-auto"     gboolean              : Read / Write
   "add-feature"              SoupSessionFeature*   : Read / Write
-  "add-feature-by-type"      GType*                : Read / Write
-  "async-context"            gpointer              : Read / Write / Construct Only
-  "idle-timeout"             guint                 : Read / Write
-  "max-conns"                gint                  : Read / Write
-  "max-conns-per-host"       gint                  : Read / Write
+  "add-feature-by-type"      GType*                : Read / Write
+  "async-context"            gpointer              : Read / Write / Construct Only
+  "idle-timeout"             guint                 : Read / Write
+  "max-conns"                gint                  : Read / Write
+  "max-conns-per-host"       gint                  : Read / Write
   "proxy-uri"                SoupURI*              : Read / Write
-  "remove-feature-by-type"   GType*                : Read / Write
-  "ssl-ca-file"              gchar*                : Read / Write
-  "ssl-strict"               gboolean              : Read / Write
-  "timeout"                  guint                 : Read / Write
-  "use-ntlm"                 gboolean              : Read / Write
-  "user-agent"               gchar*                : Read / Write
+  "remove-feature-by-type"   GType*                : Read / Write
+  "ssl-ca-file"              gchar*                : Read / Write
+  "ssl-strict"               gboolean              : Read / Write
+  "timeout"                  guint                 : Read / Write
+  "use-ntlm"                 gboolean              : Read / Write
+  "user-agent"               gchar*                : Read / Write
 

 

 

@@ -182,7 +182,7 @@
 
SoupSessionCallback ()

 
void                (*SoupSessionCallback)              (SoupSession *session,
                                                          SoupMessage *msg,
-                                                         gpointer user_data);

+                                                         gpointer user_data);

Prototype for the callback passed to soup_session_queue_message(), qv. @@ -214,7 +214,7 @@ 

void                soup_session_queue_message          (SoupSession *session,
                                                          SoupMessage *msg,
                                                          SoupSessionCallback callback,
-                                                         gpointer user_data);
+ gpointer user_data);

Queues the message msg for sending. All messages are processed while the glib main loop runs. If msg has been processed before, @@ -236,18 +236,18 @@

- - - @@ -281,7 +281,7 @@

soup_session_send_message ()

-
guint               soup_session_send_message           (SoupSession *session,
+
guint               soup_session_send_message           (SoupSession *session,
                                                          SoupMessage *msg);

 

 Synchronously send msg. This call will not return until the
@@ -317,7 +317,7 @@
 
soup_session_cancel_message ()

 
void                soup_session_cancel_message         (SoupSession *session,
                                                          SoupMessage *msg,
-                                                         guint status_code);

+                                                         guint status_code);

Causes session to immediately finish processing msg (regardless of its current state) with a final status_code of status_code. You @@ -436,7 +436,7 @@

soup_session_get_async_context ()

-
GMainContext *      soup_session_get_async_context      (SoupSession *session);
+
GMainContext *      soup_session_get_async_context      (SoupSession *session);

Gets session's async_context. This does not add a ref to the context, so you will need to ref it yourself if you want it to @@ -452,7 +452,7 @@

- @@ -489,7 +489,7 @@

soup_session_add_feature_by_type ()

void                soup_session_add_feature_by_type    (SoupSession *session,
-                                                         GType feature_type);
+ GType feature_type);

Creates a new feature of type feature_type and adds it to session. You can use this instead of soup_session_add_feature() in @@ -507,7 +507,7 @@

- @@ -543,7 +543,7 @@

soup_session_remove_feature_by_type ()

void                soup_session_remove_feature_by_type (SoupSession *session,
-                                                         GType feature_type);
+ GType feature_type);

Removes all features of type feature_type (or any subclass of feature_type) from session. You can also remove standard features @@ -560,7 +560,7 @@

- @@ -570,8 +570,8 @@

soup_session_get_features ()

-
GSList *            soup_session_get_features           (SoupSession *session,
-                                                         GType feature_type);
+
GSList *            soup_session_get_features           (SoupSession *session,
+                                                         GType feature_type);

Generates a list of session's features of type feature_type. (If you want to see all features, you can pass G_TYPE_SESSION_FEATURE @@ -587,7 +587,7 @@

- @@ -605,7 +605,7 @@

soup_session_get_feature ()

SoupSessionFeature * soup_session_get_feature           (SoupSession *session,
-                                                         GType feature_type);
+ GType feature_type);

Gets the first feature in session of type feature_type. For features where there may be more than one feature of a given type, @@ -621,12 +621,12 @@

- - @@ -640,7 +640,7 @@

soup_session_get_feature_for_message ()

SoupSessionFeature * soup_session_get_feature_for_message
                                                         (SoupSession *session,
-                                                         GType feature_type,
+                                                         GType feature_type,
                                                          SoupMessage *msg);

Gets the first feature in session of type feature_type, provided @@ -649,7 +649,7 @@ where feature_type is only expected to match a single feature. In particular, if there are two matching features, and the first is disabled on msg, and the second is not, then this will return -NULL, not the second feature. +NULL, not the second feature.

Returns :

 server's GMainContext, which may be NULL. [transfer none] + server's GMainContext, which may be NULL

query :

 the parsed query - component of msg's Request-URI. [element-type utf8 utf8][allow-none utf8 utf8] +the parsed query component of msg's Request-URI

path :

 the toplevel path for the handler. [allow-none] +the toplevel path for the handler

Returns :

 the SoupSocket that client is -associated with.. [transfer none] + the SoupSocket that client is associated with.

Returns :

 the SoupAddress associated with the -remote end of a connection.. [transfer none] + the SoupAddress associated with the remote end of a +connection.

Returns :

 a SoupAuthDomain, or -NULL if the request was not authenticated.. [transfer none][allow-none] + a SoupAuthDomain, or NULL if the request was not +authenticated.

Returns :

 the authenticated-as user, or NULL if the request + the authenticated-as user, or NULL if the request was not authenticated.

GTypeInterface parent;

GTypeInterface parent;

 The parent interface.

msg :

 the message to queue. [transfer full] +the message to queue

callback :

 a SoupSessionCallback which will -be called after the message completes or when an unrecoverable error occurs.. [allow-none][scope async] +a SoupSessionCallback which will be called after the +message completes or when an unrecoverable error occurs.

user_data :

 a pointer passed to callback.. [allow-none] +a pointer passed to callback.

Returns :

 session's GMainContext, which may be NULL + session's GMainContext, which may be NULL

feature_type :

the GType of a class that implements SoupSessionFeature +the GType of a class that implements SoupSessionFeature

feature_type :

the GType of a class that implements SoupSessionFeature +the GType of a class that implements SoupSessionFeature

feature_type :

the GType of the class of features to get +the GType of the class of features to get

feature_type :

the GType of the feature to get +the GType of the feature to get

Returns :

 a SoupSessionFeature, or NULL. The feature is owned + a SoupSessionFeature, or NULL. The feature is owned by session.
@@ -661,7 +661,7 @@ - @@ -671,7 +671,7 @@ - @@ -738,7 +738,7 @@

Alias for the "async-context" property. (The -session's GMainContext.) +session's GMainContext.)

@@ -810,9 +810,9 @@

Property Details

The "accept-language" property

-
  "accept-language"          gchar*                : Read / Write
+
  "accept-language"          gchar*                : Read / Write

-If non-NULL, the value to use for the "Accept-Language" header +If non-NULL, the value to use for the "Accept-Language" header on SoupMessages sent from this session.

@@ -825,11 +825,11 @@

The "accept-language-auto" property

-
  "accept-language-auto"     gboolean              : Read / Write
+
  "accept-language-auto"     gboolean              : Read / Write

-If TRUE, SoupSession will automatically set the string +If TRUE, SoupSession will automatically set the string for the "Accept-Language" header on every SoupMessage -sent, based on the return value of g_get_language_names(). +sent, based on the return value of g_get_language_names().

Setting this will override any previous value of @@ -851,7 +851,7 @@

The "add-feature-by-type" property

-
  "add-feature-by-type"      GType*                : Read / Write
+
  "add-feature-by-type"      GType*                : Read / Write

Add a feature object of the given type to the session. (Shortcut for calling soup_session_add_feature_by_type().) @@ -861,13 +861,13 @@

The "async-context" property

-
  "async-context"            gpointer              : Read / Write / Construct Only
+
  "async-context"            gpointer              : Read / Write / Construct Only

The GMainContext to dispatch async I/O in.

The "idle-timeout" property

-
  "idle-timeout"             guint                 : Read / Write
+
  "idle-timeout"             guint                 : Read / Write

Connection lifetime when idle

@@ -877,7 +877,7 @@

The "max-conns" property

-
  "max-conns"                gint                  : Read / Write
+
  "max-conns"                gint                  : Read / Write

The maximum number of connections that the session can open at once.

Allowed values: >= 1

Default value: 10

@@ -885,7 +885,7 @@

The "max-conns-per-host" property

-
  "max-conns-per-host"       gint                  : Read / Write
+
  "max-conns-per-host"       gint                  : Read / Write

The maximum number of connections that the session can open at once to a given host.

Allowed values: >= 1

Default value: 2

@@ -899,7 +899,7 @@

The "remove-feature-by-type" property

-
  "remove-feature-by-type"   GType*                : Read / Write
+
  "remove-feature-by-type"   GType*                : Read / Write

Remove feature objects from the session. (Shortcut for calling soup_session_remove_feature_by_type().) @@ -909,37 +909,37 @@

The "ssl-ca-file" property

-
  "ssl-ca-file"              gchar*                : Read / Write
+
  "ssl-ca-file"              gchar*                : Read / Write

File containing SSL CA certificates.

Default value: NULL

The "ssl-strict" property

-
  "ssl-strict"               gboolean              : Read / Write
+
  "ssl-strict"               gboolean              : Read / Write

Whether certificate errors should be considered a connection error.

Default value: TRUE

The "timeout" property

-
  "timeout"                  guint                 : Read / Write
+
  "timeout"                  guint                 : Read / Write

Value in seconds to timeout a blocking I/O.

Default value: 0

The "use-ntlm" property

-
  "use-ntlm"                 gboolean              : Read / Write
+
  "use-ntlm"                 gboolean              : Read / Write

Whether or not to use NTLM authentication.

Default value: FALSE

The "user-agent" property

-
  "user-agent"               gchar*                : Read / Write
+
  "user-agent"               gchar*                : Read / Write

-If non-NULL, the value to use for the "User-Agent" header +If non-NULL, the value to use for the "User-Agent" header on SoupMessages sent from this session.

@@ -976,13 +976,13 @@ 

void                user_function                      (SoupSession *session,
                                                         SoupMessage *msg,
                                                         SoupAuth    *auth,
-                                                        gboolean     retrying,
-                                                        gpointer     user_data)      : Run First
+ gboolean retrying, + gpointer user_data) : Run First

Emitted when the session requires authentication. If credentials are available call soup_auth_authenticate() on auth. If these credentials fail, the signal will be -emitted again, with retrying set to TRUE, which will +emitted again, with retrying set to TRUE, which will continue until you return without calling soup_auth_authenticate() on auth.

@@ -993,7 +993,7 @@

If you call soup_session_pause_message() on msg before returning, then you can authenticate auth asynchronously -(as long as you g_object_ref() it to make sure it doesn't +(as long as you g_object_ref() it to make sure it doesn't get destroyed), and then unpause msg when you are ready for it to continue.

@@ -1018,7 +1018,7 @@
@@ -1032,8 +1032,8 @@

The "connection-created" signal

void                user_function                      (SoupSession *soupsession,
-                                                        GObject     *arg1,
-                                                        gpointer     user_data)        : Run First
+ GObject *arg1, + gpointer user_data) : Run First

feature_type :

the GType of the feature to get +the GType of the feature to get

Returns :

 a SoupSessionFeature, or NULL. The feature is owned + a SoupSessionFeature, or NULL. The feature is owned by session.

retrying :

 -TRUE if this is the second (or later) attempt +TRUE if this is the second (or later) attempt
@@ -1061,7 +1061,7 @@

The "request-queued" signal

void                user_function                      (SoupSession *session,
                                                         SoupMessage *msg,
-                                                        gpointer     user_data)      : Run First
+ gpointer user_data) : Run First

Emitted when a request is queued on session. (Note that "queued" doesn't just mean soup_session_queue_message(); @@ -1131,7 +1131,7 @@ 

void                user_function                      (SoupSession *session,
                                                         SoupMessage *msg,
                                                         SoupSocket  *socket,
-                                                        gpointer     user_data)      : Run First
+ gpointer user_data) : Run First

Emitted just before a request is sent. See "request_queued" for a detailed description of @@ -1167,7 +1167,7 @@

The "request-unqueued" signal

void                user_function                      (SoupSession *session,
                                                         SoupMessage *msg,
-                                                        gpointer     user_data)      : Run First
+ gpointer user_data) : Run First

Emitted when a request is removed from session's queue, indicating that session is done with it. See @@ -1199,8 +1199,8 @@

The "tunneling" signal

void                user_function                      (SoupSession *soupsession,
-                                                        GObject     *arg1,
-                                                        gpointer     user_data)        : Run First
+ GObject *arg1, + gpointer user_data) : Run First

diff -Nru libsoup2.4-2.30.1/docs/reference/html/SoupSessionSync.html libsoup2.4-2.30.2/docs/reference/html/SoupSessionSync.html --- libsoup2.4-2.30.1/docs/reference/html/SoupSessionSync.html 2010-04-26 21:56:18.000000000 +0100 +++ libsoup2.4-2.30.2/docs/reference/html/SoupSessionSync.html 2010-06-22 18:08:01.000000000 +0100 @@ -52,7 +52,7 @@

Object Hierarchy

-  GObject
+  GObject
    +----SoupSession
          +----SoupSessionSync
diff -Nru libsoup2.4-2.30.1/docs/reference/html/SoupSocket.html libsoup2.4-2.30.2/docs/reference/html/SoupSocket.html --- libsoup2.4-2.30.1/docs/reference/html/SoupSocket.html 2010-04-26 21:56:18.000000000 +0100 +++ libsoup2.4-2.30.2/docs/reference/html/SoupSocket.html 2010-06-22 18:08:00.000000000 +0100 @@ -51,52 +51,52 @@ ...); void (*SoupSocketCallback) (SoupSocket *sock, - guint status, - gpointer user_data); + guint status, + gpointer user_data); void soup_socket_connect_async (SoupSocket *sock, - GCancellable *cancellable, + GCancellable *cancellable, SoupSocketCallback callback, - gpointer user_data); -guint soup_socket_connect_sync (SoupSocket *sock, - GCancellable *cancellable); + gpointer user_data); +guint soup_socket_connect_sync (SoupSocket *sock, + GCancellable *cancellable); -gboolean soup_socket_listen (SoupSocket *sock); +gboolean soup_socket_listen (SoupSocket *sock); -gboolean soup_socket_start_ssl (SoupSocket *sock, - GCancellable *cancellable); -gboolean soup_socket_start_proxy_ssl (SoupSocket *sock, +gboolean soup_socket_start_ssl (SoupSocket *sock, + GCancellable *cancellable); +gboolean soup_socket_start_proxy_ssl (SoupSocket *sock, const char *ssl_host, - GCancellable *cancellable); -gboolean soup_socket_is_ssl (SoupSocket *sock); + GCancellable *cancellable); +gboolean soup_socket_is_ssl (SoupSocket *sock); void soup_socket_disconnect (SoupSocket *sock); -gboolean soup_socket_is_connected (SoupSocket *sock); +gboolean soup_socket_is_connected (SoupSocket *sock); SoupAddress * soup_socket_get_local_address (SoupSocket *sock); SoupAddress * soup_socket_get_remote_address (SoupSocket *sock); enum SoupSocketIOStatus; SoupSocketIOStatus soup_socket_read (SoupSocket *sock, - gpointer buffer, - gsize len, - gsize *nread, - GCancellable *cancellable, - GError **error); + gpointer buffer, + gsize len, + gsize *nread, + GCancellable *cancellable, + GError **error); SoupSocketIOStatus soup_socket_read_until (SoupSocket *sock, - gpointer buffer, - gsize len, - gconstpointer boundary, - gsize boundary_len, - gsize *nread, - gboolean *got_boundary, - GCancellable *cancellable, - GError **error); + gpointer buffer, + gsize len, + gconstpointer boundary, + gsize boundary_len, + gsize *nread, + gboolean *got_boundary, + GCancellable *cancellable, + GError **error); SoupSocketIOStatus soup_socket_write (SoupSocket *sock, - gconstpointer buffer, - gsize len, - gsize *nwrote, - GCancellable *cancellable, - GError **error); + gconstpointer buffer, + gsize len, + gsize *nwrote, + GCancellable *cancellable, + GError **error); #define SOUP_SSL_ERROR enum SoupSSLError; @@ -113,22 +113,22 @@

Object Hierarchy

-  GObject
+  GObject
    +----SoupSocket

Properties

-  "async-context"            gpointer              : Read / Write / Construct Only
-  "is-server"                gboolean              : Read
+  "async-context"            gpointer              : Read / Write / Construct Only
+  "is-server"                gboolean              : Read
   "local-address"            SoupAddress*          : Read / Write / Construct Only
-  "non-blocking"             gboolean              : Read / Write
+  "non-blocking"             gboolean              : Read / Write
   "remote-address"           SoupAddress*          : Read / Write / Construct Only
-  "ssl-creds"                gpointer              : Read / Write
-  "ssl-strict"               gboolean              : Read / Write / Construct Only
-  "timeout"                  guint                 : Read / Write
-  "trusted-certificate"      gboolean              : Read / Write / Construct Only
+  "ssl-creds"                gpointer              : Read / Write
+  "ssl-strict"               gboolean              : Read / Write / Construct Only
+  "timeout"                  guint                 : Read / Write
+  "trusted-certificate"      gboolean              : Read / Write / Construct Only
@@ -170,7 +170,7 @@
- @@ -190,8 +190,8 @@

SoupSocketCallback ()

void                (*SoupSocketCallback)               (SoupSocket *sock,
-                                                         guint status,
-                                                         gpointer user_data);
+ guint status, + gpointer user_data);

The callback function passed to soup_socket_connect_async().

@@ -220,16 +220,16 @@

soup_socket_connect_async ()

void                soup_socket_connect_async           (SoupSocket *sock,
-                                                         GCancellable *cancellable,
+                                                         GCancellable *cancellable,
                                                          SoupSocketCallback callback,
-                                                         gpointer user_data);
+ gpointer user_data);

Begins asynchronously connecting to sock's remote address. The socket will call callback when it succeeds or fails (but not before returning from this function).

-If cancellable is non-NULL, it can be used to cancel the +If cancellable is non-NULL, it can be used to cancel the connection. callback will still be invoked in this case, with a status of SOUP_STATUS_CANCELLED.

@@ -243,12 +243,12 @@
- - @@ -262,13 +262,13 @@

soup_socket_connect_sync ()

-
guint               soup_socket_connect_sync            (SoupSocket *sock,
-                                                         GCancellable *cancellable);
+
guint               soup_socket_connect_sync            (SoupSocket *sock,
+                                                         GCancellable *cancellable);

Attempt to synchronously connect sock to its remote address.

-If cancellable is non-NULL, it can be used to cancel the +If cancellable is non-NULL, it can be used to cancel the connection, in which case soup_socket_connect_sync() will return SOUP_STATUS_CANCELLED.

@@ -282,7 +282,7 @@
- @@ -296,7 +296,7 @@

soup_socket_listen ()

-
gboolean            soup_socket_listen                  (SoupSocket *sock);
+
gboolean            soup_socket_listen                  (SoupSocket *sock);

Makes sock start listening on its local address. When connections come in, sock will emit new_connection. @@ -321,8 +321,8 @@

soup_socket_start_ssl ()

-
gboolean            soup_socket_start_ssl               (SoupSocket *sock,
-                                                         GCancellable *cancellable);
+
gboolean            soup_socket_start_ssl               (SoupSocket *sock,
+                                                         GCancellable *cancellable);

Starts using SSL on socket.

@@ -336,7 +336,7 @@
- @@ -350,9 +350,9 @@

soup_socket_start_proxy_ssl ()

-
gboolean            soup_socket_start_proxy_ssl         (SoupSocket *sock,
+
gboolean            soup_socket_start_proxy_ssl         (SoupSocket *sock,
                                                          const char *ssl_host,
-                                                         GCancellable *cancellable);

+                                                         GCancellable *cancellable);

Starts using SSL on socket, expecting to find a host named ssl_host. @@ -372,7 +372,7 @@

- @@ -386,7 +386,7 @@

soup_socket_is_ssl ()

-
gboolean            soup_socket_is_ssl                  (SoupSocket *sock);
+
gboolean            soup_socket_is_ssl                  (SoupSocket *sock);

Tests if sock is set up to do SSL. Note that this simply means that the SOUP_SOCKET_SSL_CREDENTIALS property has been set; it @@ -402,7 +402,7 @@

- @@ -428,7 +428,7 @@

soup_socket_is_connected ()

-
gboolean            soup_socket_is_connected            (SoupSocket *sock);
+
gboolean            soup_socket_is_connected            (SoupSocket *sock);

Tests if sock is connected to another host

@@ -442,7 +442,7 @@
- @@ -465,7 +465,7 @@ - @@ -488,7 +488,7 @@ - @@ -537,11 +537,11 @@

soup_socket_read ()

SoupSocketIOStatus  soup_socket_read                    (SoupSocket *sock,
-                                                         gpointer buffer,
-                                                         gsize len,
-                                                         gsize *nread,
-                                                         GCancellable *cancellable,
-                                                         GError **error);
+ gpointer buffer, + gsize len, + gsize *nread, + GCancellable *cancellable, + GError **error);

Attempts to read up to len bytes from sock into buffer. If some data is successfully read, soup_socket_read() will return @@ -582,7 +582,7 @@

- @@ -605,19 +605,19 @@

soup_socket_read_until ()

SoupSocketIOStatus  soup_socket_read_until              (SoupSocket *sock,
-                                                         gpointer buffer,
-                                                         gsize len,
-                                                         gconstpointer boundary,
-                                                         gsize boundary_len,
-                                                         gsize *nread,
-                                                         gboolean *got_boundary,
-                                                         GCancellable *cancellable,
-                                                         GError **error);
+ gpointer buffer, + gsize len, + gconstpointer boundary, + gsize boundary_len, + gsize *nread, + gboolean *got_boundary, + GCancellable *cancellable, + GError **error);

Like soup_socket_read(), but reads no further than the first occurrence of boundary. (If the boundary is found, it will be included in the returned data, and *got_boundary will be set to -TRUE.) Any data after the boundary will returned in future reads. +TRUE.) Any data after the boundary will returned in future reads.

soup_socket_read_until() will almost always return fewer than len @@ -669,7 +669,7 @@

- @@ -689,11 +689,11 @@

soup_socket_write ()

SoupSocketIOStatus  soup_socket_write                   (SoupSocket *sock,
-                                                         gconstpointer buffer,
-                                                         gsize len,
-                                                         gsize *nwrote,
-                                                         GCancellable *cancellable,
-                                                         GError **error);
+ gconstpointer buffer, + gsize len, + gsize *nwrote, + GCancellable *cancellable, + GError **error);

Attempts to write len bytes from buffer to sock. If some data is successfully written, the return status will be SOUP_SOCKET_OK, @@ -734,7 +734,7 @@

- @@ -758,7 +758,7 @@ 
#define SOUP_SSL_ERROR soup_ssl_error_quark()

-A GError domain representing an SSL error. Used with SoupSSLError. +A GError domain representing an SSL error. Used with SoupSSLError.

@@ -767,7 +767,8 @@ 
typedef enum {
 	SOUP_SSL_ERROR_HANDSHAKE_NEEDS_READ,
 	SOUP_SSL_ERROR_HANDSHAKE_NEEDS_WRITE,
-	SOUP_SSL_ERROR_CERTIFICATE
+	SOUP_SSL_ERROR_CERTIFICATE,
+	SOUP_SSL_ERROR_HANDSHAKE_FAILED
 } SoupSSLError;

@@ -794,6 +795,11 @@ certificate

+ + + +

optname1 :

name of first property to set (or NULL) +name of first property to set (or NULL)

cancellable :

a GCancellable, or NULL +a GCancellable, or NULL

callback :

 callback to call after connecting. [scope async] +callback to call after connecting

cancellable :

a GCancellable, or NULL +a GCancellable, or NULL

cancellable :

a GCancellable +a GCancellable

cancellable :

a GCancellable +a GCancellable

Returns :

 TRUE if sock has SSL credentials set + TRUE if sock has SSL credentials set

Returns :

 TRUE or FALSE. + TRUE or FALSE.

Returns :

 the SoupAddress. [transfer none] + the SoupAddress

Returns :

 the SoupAddress. [transfer none] + the SoupAddress

cancellable :

a GCancellable, or NULL +a GCancellable, or NULL

cancellable :

a GCancellable, or NULL +a GCancellable, or NULL

cancellable :

a GCancellable, or NULL +a GCancellable, or NULL

SOUP_SSL_ERROR_HANDSHAKE_FAILED

 +
@@ -854,7 +860,7 @@

Alias for the "async-context" property. (The -socket's GMainContext.) +socket's GMainContext.)

@@ -872,13 +878,13 @@

Property Details

The "async-context" property

-
  "async-context"            gpointer              : Read / Write / Construct Only
+
  "async-context"            gpointer              : Read / Write / Construct Only

The GMainContext to dispatch this socket's async I/O in.

The "is-server" property

-
  "is-server"                gboolean              : Read
+
  "is-server"                gboolean              : Read

Whether or not the socket is a server socket.

Default value: FALSE

@@ -891,7 +897,7 @@

The "non-blocking" property

-
  "non-blocking"             gboolean              : Read / Write
+
  "non-blocking"             gboolean              : Read / Write

Whether or not the socket uses non-blocking I/O.

@@ -927,27 +933,27 @@

The "ssl-creds" property

-
  "ssl-creds"                gpointer              : Read / Write
+
  "ssl-creds"                gpointer              : Read / Write

SSL credential information, passed from the session to the SSL implementation.

The "ssl-strict" property

-
  "ssl-strict"               gboolean              : Read / Write / Construct Only
+
  "ssl-strict"               gboolean              : Read / Write / Construct Only

Whether certificate errors should be considered a connection error.

Default value: TRUE

The "timeout" property

-
  "timeout"                  guint                 : Read / Write
+
  "timeout"                  guint                 : Read / Write

Value in seconds to timeout a blocking I/O.

Default value: 0

The "trusted-certificate" property

-
  "trusted-certificate"      gboolean              : Read / Write / Construct Only
+
  "trusted-certificate"      gboolean              : Read / Write / Construct Only

Whether the server certificate is trusted, if this is an SSL socket.

Default value: FALSE

@@ -957,7 +963,7 @@

The "disconnected" signal

void                user_function                      (SoupSocket *sock,
-                                                        gpointer    user_data)      : Run Last
+ gpointer user_data) : Run Last

Emitted when the socket is disconnected, for whatever reason. @@ -982,7 +988,7 @@

The "new-connection" signal

void                user_function                      (SoupSocket *sock,
                                                         SoupSocket *new,
-                                                        gpointer    user_data)      : Run First
+ gpointer user_data) : Run First

Emitted when a listening socket (set up with soup_socket_listen()) receives a new connection. @@ -1015,7 +1021,7 @@

The "readable" signal

void                user_function                      (SoupSocket *sock,
-                                                        gpointer    user_data)      : Run Last
+ gpointer user_data) : Run Last

Emitted when an async socket is readable. See soup_socket_read(), soup_socket_read_until() and @@ -1040,7 +1046,7 @@

The "writable" signal

void                user_function                      (SoupSocket *sock,
-                                                        gpointer    user_data)      : Run Last
+ gpointer user_data) : Run Last

Emitted when an async socket is writable. See soup_socket_write() and "non-blocking". diff -Nru libsoup2.4-2.30.1/docs/reference/tmpl/soup-socket.sgml libsoup2.4-2.30.2/docs/reference/tmpl/soup-socket.sgml --- libsoup2.4-2.30.1/docs/reference/tmpl/soup-socket.sgml 2010-04-26 21:56:18.000000000 +0100 +++ libsoup2.4-2.30.2/docs/reference/tmpl/soup-socket.sgml 2010-06-22 18:08:00.000000000 +0100 @@ -287,6 +287,7 @@ @SOUP_SSL_ERROR_HANDSHAKE_NEEDS_READ: @SOUP_SSL_ERROR_HANDSHAKE_NEEDS_WRITE: @SOUP_SSL_ERROR_CERTIFICATE: +@SOUP_SSL_ERROR_HANDSHAKE_FAILED: diff -Nru libsoup2.4-2.30.1/docs/reference/tmpl/soup-status.sgml libsoup2.4-2.30.2/docs/reference/tmpl/soup-status.sgml --- libsoup2.4-2.30.1/docs/reference/tmpl/soup-status.sgml 2010-04-26 21:56:18.000000000 +0100 +++ libsoup2.4-2.30.2/docs/reference/tmpl/soup-status.sgml 2010-06-22 18:08:00.000000000 +0100 @@ -85,6 +85,7 @@ @SOUP_STATUS_IO_ERROR: @SOUP_STATUS_MALFORMED: @SOUP_STATUS_TRY_AGAIN: +@SOUP_STATUS_TOO_MANY_REDIRECTS: @SOUP_STATUS_CONTINUE: @SOUP_STATUS_SWITCHING_PROTOCOLS: @SOUP_STATUS_PROCESSING: diff -Nru libsoup2.4-2.30.1/libsoup/soup-connection.c libsoup2.4-2.30.2/libsoup/soup-connection.c --- libsoup2.4-2.30.1/libsoup/soup-connection.c 2010-04-10 00:46:34.000000000 +0100 +++ libsoup2.4-2.30.2/libsoup/soup-connection.c 2010-06-22 16:58:44.000000000 +0100 @@ -360,7 +360,6 @@ g_object_freeze_notify (G_OBJECT (conn)); stop_idle_timer (priv); - priv->unused_timeout = 0; soup_message_set_io_status (req, SOUP_MESSAGE_IO_STATUS_RUNNING); priv->cur_req = req; @@ -382,6 +381,8 @@ g_object_freeze_notify (G_OBJECT (conn)); + priv->unused_timeout = 0; + if (priv->state == SOUP_CONNECTION_IN_USE) { /* We don't use soup_connection_set_state here since * it may call clear_current_request()... @@ -423,7 +424,21 @@ socket_connect_result (SoupSocket *sock, guint status, gpointer user_data) { SoupConnectionAsyncConnectData *data = user_data; - SoupConnectionPrivate *priv = SOUP_CONNECTION_GET_PRIVATE (data->conn); + SoupConnectionPrivate *priv; + + if (!data->conn) { + if (data->callback) { + data->callback (NULL, SOUP_STATUS_CANCELLED, + data->callback_data); + } + g_slice_free (SoupConnectionAsyncConnectData, data); + return; + } + + g_object_remove_weak_pointer (G_OBJECT (data->conn), + (gpointer *)&data->conn); + + priv = SOUP_CONNECTION_GET_PRIVATE (data->conn); if (!SOUP_STATUS_IS_SUCCESSFUL (status)) goto done; @@ -477,6 +492,7 @@ data->conn = conn; data->callback = callback; data->callback_data = user_data; + g_object_add_weak_pointer (G_OBJECT (conn), (gpointer *)&data->conn); priv->socket = soup_socket_new (SOUP_SOCKET_REMOTE_ADDRESS, priv->remote_addr, @@ -590,6 +606,7 @@ g_return_if_fail (SOUP_IS_CONNECTION (conn)); priv = SOUP_CONNECTION_GET_PRIVATE (conn); + soup_connection_set_state (conn, SOUP_CONNECTION_DISCONNECTED); if (!priv->socket) return; @@ -599,11 +616,6 @@ g_object_unref (priv->socket); priv->socket = NULL; - /* Don't emit "disconnected" if we aren't yet connected */ - if (priv->state < SOUP_CONNECTION_IDLE) - return; - - soup_connection_set_state (conn, SOUP_CONNECTION_DISCONNECTED); /* NB: this might cause conn to be destroyed. */ g_signal_emit (conn, signals[DISCONNECTED], 0); } @@ -671,6 +683,14 @@ g_object_notify (G_OBJECT (conn), "state"); } +gboolean +soup_connection_get_ever_used (SoupConnection *conn) +{ + g_return_val_if_fail (SOUP_IS_CONNECTION (conn), FALSE); + + return SOUP_CONNECTION_GET_PRIVATE (conn)->unused_timeout == 0; +} + /** * soup_connection_send_request: * @conn: a #SoupConnection diff -Nru libsoup2.4-2.30.1/libsoup/soup-connection.h libsoup2.4-2.30.2/libsoup/soup-connection.h --- libsoup2.4-2.30.1/libsoup/soup-connection.h 2010-04-10 00:46:34.000000000 +0100 +++ libsoup2.4-2.30.2/libsoup/soup-connection.h 2010-06-22 16:58:44.000000000 +0100 @@ -70,6 +70,8 @@ void soup_connection_set_state (SoupConnection *conn, SoupConnectionState state); +gboolean soup_connection_get_ever_used (SoupConnection *conn); + void soup_connection_send_request (SoupConnection *conn, SoupMessage *req); diff -Nru libsoup2.4-2.30.1/libsoup/soup-date.c libsoup2.4-2.30.2/libsoup/soup-date.c --- libsoup2.4-2.30.1/libsoup/soup-date.c 2010-04-26 21:15:37.000000000 +0100 +++ libsoup2.4-2.30.2/libsoup/soup-date.c 2010-06-22 17:24:12.000000000 +0100 @@ -355,7 +355,10 @@ static inline gboolean parse_timezone (SoupDate *date, const char **date_string) { - if (**date_string == '+' || **date_string == '-') { + if (!**date_string) { + date->utc = FALSE; + date->offset = 0; + } else if (**date_string == '+' || **date_string == '-') { gulong val; int sign = (**date_string == '+') ? -1 : 1; val = strtoul (*date_string + 1, (char **)date_string, 10); @@ -381,9 +384,6 @@ if ((*date_string)[1] == 'D') date->offset += 60; date->utc = FALSE; - } else if (!**date_string) { - date->utc = FALSE; - date->offset = 0; } else return FALSE; return TRUE; diff -Nru libsoup2.4-2.30.1/libsoup/soup-enum-types.c libsoup2.4-2.30.2/libsoup/soup-enum-types.c --- libsoup2.4-2.30.1/libsoup/soup-enum-types.c 2010-04-26 21:55:23.000000000 +0100 +++ libsoup2.4-2.30.2/libsoup/soup-enum-types.c 2010-06-22 17:00:14.000000000 +0100 @@ -187,6 +187,7 @@ { SOUP_SSL_ERROR_HANDSHAKE_NEEDS_READ, "SOUP_SSL_ERROR_HANDSHAKE_NEEDS_READ", "handshake-needs-read" }, { SOUP_SSL_ERROR_HANDSHAKE_NEEDS_WRITE, "SOUP_SSL_ERROR_HANDSHAKE_NEEDS_WRITE", "handshake-needs-write" }, { SOUP_SSL_ERROR_CERTIFICATE, "SOUP_SSL_ERROR_CERTIFICATE", "certificate" }, + { SOUP_SSL_ERROR_HANDSHAKE_FAILED, "SOUP_SSL_ERROR_HANDSHAKE_FAILED", "handshake-failed" }, { 0, NULL, NULL } }; etype = g_enum_register_static (g_intern_static_string ("SoupSSLError"), values); @@ -248,6 +249,7 @@ { SOUP_STATUS_IO_ERROR, "SOUP_STATUS_IO_ERROR", "io-error" }, { SOUP_STATUS_MALFORMED, "SOUP_STATUS_MALFORMED", "malformed" }, { SOUP_STATUS_TRY_AGAIN, "SOUP_STATUS_TRY_AGAIN", "try-again" }, + { SOUP_STATUS_TOO_MANY_REDIRECTS, "SOUP_STATUS_TOO_MANY_REDIRECTS", "too-many-redirects" }, { SOUP_STATUS_CONTINUE, "SOUP_STATUS_CONTINUE", "continue" }, { SOUP_STATUS_SWITCHING_PROTOCOLS, "SOUP_STATUS_SWITCHING_PROTOCOLS", "switching-protocols" }, { SOUP_STATUS_PROCESSING, "SOUP_STATUS_PROCESSING", "processing" }, diff -Nru libsoup2.4-2.30.1/libsoup/soup-form.c libsoup2.4-2.30.2/libsoup/soup-form.c --- libsoup2.4-2.30.1/libsoup/soup-form.c 2010-04-26 21:15:37.000000000 +0100 +++ libsoup2.4-2.30.2/libsoup/soup-form.c 2010-06-22 16:58:44.000000000 +0100 @@ -377,6 +377,7 @@ /* Don't crash */ msg = soup_message_new_from_uri (method, uri); } + soup_uri_free (uri); return msg; } diff -Nru libsoup2.4-2.30.1/libsoup/soup-gnutls.c libsoup2.4-2.30.2/libsoup/soup-gnutls.c --- libsoup2.4-2.30.1/libsoup/soup-gnutls.c 2010-04-10 00:46:34.000000000 +0100 +++ libsoup2.4-2.30.2/libsoup/soup-gnutls.c 2010-06-22 16:43:58.000000000 +0100 @@ -163,9 +163,10 @@ } if (result < 0) { - g_set_error (err, G_IO_CHANNEL_ERROR, - G_IO_CHANNEL_ERROR_FAILED, - "Unable to handshake"); + g_set_error (err, SOUP_SSL_ERROR, + SOUP_SSL_ERROR_HANDSHAKE_FAILED, + "SSL handshake failed: %s", + gnutls_strerror (result)); return G_IO_STATUS_ERROR; } @@ -485,6 +486,11 @@ if (type == SOUP_SSL_TYPE_SERVER) gnutls_dh_set_prime_bits (session, DH_BITS); + else { + // gnutls defaults to requiring at least 768-bit keys, + // but there are some lame servers out there... + gnutls_dh_set_prime_bits (session, 256); + } chan = g_slice_new0 (SoupGNUTLSChannel); chan->real_sock = sock; diff -Nru libsoup2.4-2.30.1/libsoup/soup-message-io.c libsoup2.4-2.30.2/libsoup/soup-message-io.c --- libsoup2.4-2.30.1/libsoup/soup-message-io.c 2010-04-10 00:46:34.000000000 +0100 +++ libsoup2.4-2.30.2/libsoup/soup-message-io.c 2010-06-22 16:58:44.000000000 +0100 @@ -200,6 +200,7 @@ } else if (io->mode == SOUP_MESSAGE_IO_CLIENT && io->read_state <= SOUP_MESSAGE_IO_STATE_HEADERS && io->read_meta_buf->len == 0 && + soup_connection_get_ever_used (io->conn) && !g_error_matches (error, G_IO_ERROR, G_IO_ERROR_TIMED_OUT) && request_is_idempotent (msg)) { /* Connection got closed, but we can safely try again */ diff -Nru libsoup2.4-2.30.1/libsoup/soup-message-queue.h libsoup2.4-2.30.2/libsoup/soup-message-queue.h --- libsoup2.4-2.30.1/libsoup/soup-message-queue.h 2009-10-21 22:29:23.000000000 +0100 +++ libsoup2.4-2.30.2/libsoup/soup-message-queue.h 2010-06-22 17:00:13.000000000 +0100 @@ -31,6 +31,8 @@ SoupURI *proxy_uri; SoupConnection *conn; + guint redirection_count; + guint resolving_proxy_addr : 1; guint resolved_proxy_addr : 1; diff -Nru libsoup2.4-2.30.1/libsoup/soup-misc.h libsoup2.4-2.30.2/libsoup/soup-misc.h --- libsoup2.4-2.30.1/libsoup/soup-misc.h 2010-04-10 00:51:33.000000000 +0100 +++ libsoup2.4-2.30.2/libsoup/soup-misc.h 2010-06-22 16:43:51.000000000 +0100 @@ -61,7 +61,8 @@ typedef enum { SOUP_SSL_ERROR_HANDSHAKE_NEEDS_READ, SOUP_SSL_ERROR_HANDSHAKE_NEEDS_WRITE, - SOUP_SSL_ERROR_CERTIFICATE + SOUP_SSL_ERROR_CERTIFICATE, + SOUP_SSL_ERROR_HANDSHAKE_FAILED } SoupSSLError; typedef enum { diff -Nru libsoup2.4-2.30.1/libsoup/soup-session-async.c libsoup2.4-2.30.2/libsoup/soup-session-async.c --- libsoup2.4-2.30.1/libsoup/soup-session-async.c 2010-04-12 15:26:51.000000000 +0100 +++ libsoup2.4-2.30.2/libsoup/soup-session-async.c 2010-06-22 16:58:44.000000000 +0100 @@ -253,10 +253,19 @@ } static void -got_connection (SoupConnection *conn, guint status, gpointer session) +got_connection (SoupConnection *conn, guint status, gpointer user_data) { + gpointer *session_p = user_data; + SoupSession *session = *session_p; SoupAddress *tunnel_addr; + if (!session) { + g_slice_free (gpointer, session_p); + return; + } + g_object_remove_weak_pointer (G_OBJECT (session), session_p); + g_slice_free (gpointer, session_p); + if (status != SOUP_STATUS_OK) { /* There may have been messages waiting for the * connection count to go down, so queue a run_queue. @@ -344,8 +353,13 @@ continue; if (soup_connection_get_state (conn) == SOUP_CONNECTION_NEW) { + gpointer *session_p; + + session_p = g_slice_new (gpointer); + *session_p = session; + g_object_add_weak_pointer (G_OBJECT (session), session_p); soup_connection_connect_async (conn, got_connection, - session); + session_p); } else soup_session_send_queue_item (session, item, conn); } diff -Nru libsoup2.4-2.30.1/libsoup/soup-session.c libsoup2.4-2.30.2/libsoup/soup-session.c --- libsoup2.4-2.30.1/libsoup/soup-session.c 2010-04-26 21:15:37.000000000 +0100 +++ libsoup2.4-2.30.2/libsoup/soup-session.c 2010-06-22 17:24:08.000000000 +0100 @@ -117,6 +117,8 @@ #define SOUP_SESSION_MAX_CONNS_DEFAULT 10 #define SOUP_SESSION_MAX_CONNS_PER_HOST_DEFAULT 2 +#define SOUP_SESSION_MAX_REDIRECTION_COUNT 20 + #define SOUP_SESSION_USER_AGENT_BASE "libsoup/" PACKAGE_VERSION G_DEFINE_TYPE (SoupSession, soup_session, G_TYPE_OBJECT) @@ -1093,6 +1095,8 @@ redirect_handler (SoupMessage *msg, gpointer user_data) { SoupSession *session = user_data; + SoupSessionPrivate *priv = SOUP_SESSION_GET_PRIVATE (session); + SoupMessageQueueItem *item; const char *new_loc; SoupURI *new_uri; @@ -1100,6 +1104,16 @@ "Location"); g_return_if_fail (new_loc != NULL); + item = soup_message_queue_lookup (priv->queue, msg); + g_return_if_fail (item != NULL); + if (item->redirection_count >= SOUP_SESSION_MAX_REDIRECTION_COUNT) { + soup_session_cancel_message (session, msg, SOUP_STATUS_TOO_MANY_REDIRECTS); + soup_message_queue_item_unref (item); + return; + } + item->redirection_count++; + soup_message_queue_item_unref (item); + if (msg->status_code == SOUP_STATUS_SEE_OTHER || (msg->status_code == SOUP_STATUS_FOUND && !SOUP_METHOD_IS_SAFE (msg->method)) || @@ -1265,11 +1279,10 @@ if (host) connection_disconnected (conn, session); - else { + else if (conn) host = g_object_get_data (G_OBJECT (conn), "SoupSessionHost"); - if (!host) - return; - } + if (!host) + return; if (status == SOUP_STATUS_TRY_AGAIN) return; diff -Nru libsoup2.4-2.30.1/libsoup/soup-socket.c libsoup2.4-2.30.2/libsoup/soup-socket.c --- libsoup2.4-2.30.1/libsoup/soup-socket.c 2010-04-26 21:15:37.000000000 +0100 +++ libsoup2.4-2.30.2/libsoup/soup-socket.c 2010-06-22 16:58:44.000000000 +0100 @@ -95,6 +95,8 @@ GMutex *iolock, *addrlock; guint timeout; + + GCancellable *connect_cancel; } SoupSocketPrivate; #define SOUP_SOCKET_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SOUP_TYPE_SOCKET, SoupSocketPrivate)) @@ -156,6 +158,8 @@ { SoupSocketPrivate *priv = SOUP_SOCKET_GET_PRIVATE (object); + if (priv->connect_cancel) + g_object_unref (priv->connect_cancel); if (priv->iochannel) disconnect_internal (priv); @@ -615,6 +619,16 @@ gpointer user_data; } SoupSocketAsyncConnectData; +static void +free_sacd (SoupSocketAsyncConnectData *sacd) +{ + if (sacd->cancel_id) + g_signal_handler_disconnect (sacd->cancellable, sacd->cancel_id); + g_object_unref (sacd->cancellable); + g_object_unref (sacd->sock); + g_slice_free (SoupSocketAsyncConnectData, sacd); +} + static gboolean idle_connect_result (gpointer user_data) { @@ -622,9 +636,8 @@ SoupSocketPrivate *priv = SOUP_SOCKET_GET_PRIVATE (sacd->sock); guint status; + priv->connect_cancel = NULL; priv->watch_src = NULL; - if (sacd->cancel_id) - g_signal_handler_disconnect (sacd->cancellable, sacd->cancel_id); if (priv->sockfd == -1) { if (g_cancellable_is_cancelled (sacd->cancellable)) @@ -635,7 +648,7 @@ status = SOUP_STATUS_OK; sacd->callback (sacd->sock, status, sacd->user_data); - g_slice_free (SoupSocketAsyncConnectData, sacd); + free_sacd (sacd); return FALSE; } @@ -684,16 +697,17 @@ got_address (SoupAddress *addr, guint status, gpointer user_data) { SoupSocketAsyncConnectData *sacd = user_data; + SoupSocketPrivate *priv = SOUP_SOCKET_GET_PRIVATE (sacd->sock); + + priv->connect_cancel = NULL; - if (!SOUP_STATUS_IS_SUCCESSFUL (status)) { + if (SOUP_STATUS_IS_SUCCESSFUL (status)) { + soup_socket_connect_async (sacd->sock, sacd->cancellable, + sacd->callback, sacd->user_data); + } else sacd->callback (sacd->sock, status, sacd->user_data); - g_slice_free (SoupSocketAsyncConnectData, sacd); - return; - } - soup_socket_connect_async (sacd->sock, sacd->cancellable, - sacd->callback, sacd->user_data); - g_slice_free (SoupSocketAsyncConnectData, sacd); + free_sacd (sacd); } static void @@ -774,15 +788,23 @@ g_return_if_fail (priv->remote_addr != NULL); sacd = g_slice_new0 (SoupSocketAsyncConnectData); - sacd->sock = sock; - sacd->cancellable = cancellable; + sacd->sock = g_object_ref (sock); + sacd->cancellable = cancellable ? g_object_ref (cancellable) : g_cancellable_new (); sacd->callback = callback; sacd->user_data = user_data; + priv->connect_cancel = sacd->cancellable; + + if (g_cancellable_is_cancelled (priv->connect_cancel)) { + priv->watch_src = soup_add_completion (priv->async_context, + idle_connect_result, sacd); + return; + } + if (!soup_address_get_sockaddr (priv->remote_addr, NULL)) { soup_address_resolve_async (priv->remote_addr, priv->async_context, - cancellable, + sacd->cancellable, got_address, sacd); return; } @@ -803,12 +825,10 @@ priv->timeout * 1000, connect_timeout, sacd); } - if (cancellable) { - sacd->cancel_id = - g_signal_connect (cancellable, "cancelled", - G_CALLBACK (async_cancel), - sacd); - } + sacd->cancel_id = + g_signal_connect (sacd->cancellable, "cancelled", + G_CALLBACK (async_cancel), + sacd); } else { priv->watch_src = soup_add_completion (priv->async_context, idle_connect_result, sacd); @@ -848,28 +868,35 @@ g_return_val_if_fail (priv->sockfd == -1, SOUP_STATUS_MALFORMED); g_return_val_if_fail (priv->remote_addr != NULL, SOUP_STATUS_MALFORMED); + if (cancellable) + g_object_ref (cancellable); + else + cancellable = g_cancellable_new (); + priv->connect_cancel = cancellable; + if (!soup_address_get_sockaddr (priv->remote_addr, NULL)) { status = soup_address_resolve_sync (priv->remote_addr, cancellable); - if (!SOUP_STATUS_IS_SUCCESSFUL (status)) + if (!SOUP_STATUS_IS_SUCCESSFUL (status)) { + priv->connect_cancel = NULL; + g_object_unref (cancellable); return status; + } } - if (cancellable) { - cancel_id = g_signal_connect (cancellable, "cancelled", - G_CALLBACK (sync_cancel), sock); - } + cancel_id = g_signal_connect (cancellable, "cancelled", + G_CALLBACK (sync_cancel), sock); status = socket_connect_internal (sock); + priv->connect_cancel = NULL; - if (cancellable) { - if (status != SOUP_STATUS_OK && - g_cancellable_is_cancelled (cancellable)) { - status = SOUP_STATUS_CANCELLED; - disconnect_internal (priv); - } - g_signal_handler_disconnect (cancellable, cancel_id); + if (status != SOUP_STATUS_OK && + g_cancellable_is_cancelled (cancellable)) { + status = SOUP_STATUS_CANCELLED; + disconnect_internal (priv); } + g_signal_handler_disconnect (cancellable, cancel_id); + g_object_unref (cancellable); return status; } @@ -1080,7 +1107,10 @@ g_return_if_fail (SOUP_IS_SOCKET (sock)); priv = SOUP_SOCKET_GET_PRIVATE (sock); - if (g_mutex_trylock (priv->iolock)) { + if (priv->connect_cancel) { + g_cancellable_cancel (priv->connect_cancel); + return; + } else if (g_mutex_trylock (priv->iolock)) { if (priv->iochannel) disconnect_internal (priv); else diff -Nru libsoup2.4-2.30.1/libsoup/soup-status.c libsoup2.4-2.30.2/libsoup/soup-status.c --- libsoup2.4-2.30.1/libsoup/soup-status.c 2010-04-12 15:26:51.000000000 +0100 +++ libsoup2.4-2.30.2/libsoup/soup-status.c 2010-06-22 17:24:12.000000000 +0100 @@ -5,6 +5,8 @@ * Copyright (C) 2001-2003, Ximian, Inc. */ +#include "config.h" + #include #include "soup-status.h" @@ -78,6 +80,7 @@ * closed the connection unexpectedly * @SOUP_STATUS_MALFORMED: Malformed data (usually a programmer error) * @SOUP_STATUS_TRY_AGAIN: Used internally + * @SOUP_STATUS_TOO_MANY_REDIRECTS: There were too many redirections * @SOUP_STATUS_CONTINUE: 100 Continue (HTTP) * @SOUP_STATUS_SWITCHING_PROTOCOLS: 101 Switching Protocols (HTTP) * @SOUP_STATUS_PROCESSING: 102 Processing (WebDAV) @@ -185,6 +188,7 @@ #endif { SOUP_STATUS_IO_ERROR, "Connection terminated unexpectedly" }, { SOUP_STATUS_MALFORMED, "Message Corrupt" }, + { SOUP_STATUS_TOO_MANY_REDIRECTS, "Too many redirects" }, /* Informational */ { SOUP_STATUS_CONTINUE, "Continue" }, diff -Nru libsoup2.4-2.30.1/libsoup/soup-status.h libsoup2.4-2.30.2/libsoup/soup-status.h --- libsoup2.4-2.30.1/libsoup/soup-status.h 2009-09-07 14:57:06.000000000 +0100 +++ libsoup2.4-2.30.2/libsoup/soup-status.h 2010-06-22 17:00:13.000000000 +0100 @@ -32,6 +32,7 @@ SOUP_STATUS_IO_ERROR, SOUP_STATUS_MALFORMED, SOUP_STATUS_TRY_AGAIN, + SOUP_STATUS_TOO_MANY_REDIRECTS, /* HTTP Status Codes */ SOUP_STATUS_CONTINUE = 100, diff -Nru libsoup2.4-2.30.1/NEWS libsoup2.4-2.30.2/NEWS --- libsoup2.4-2.30.1/NEWS 2010-04-26 21:54:13.000000000 +0100 +++ libsoup2.4-2.30.2/NEWS 2010-06-22 18:07:17.000000000 +0100 @@ -1,3 +1,29 @@ +Changes in libsoup from 2.30.1 to 2.30.2: + + * Fixed a problem with SoupSessionAsync that would cause + messages to get lost if you aborted a previous message while + it was still looking up the hostname. Fixed several other + problems that were discovered while adding a regression test + for that. [#618641, thanks to Claudio Saavedra for a good + test case] + + * SoupSession now only allows a message to be redirected a + fixed number of times, and returns an error after that. + [#604383, José Millán Soto] + + * Fixed another connecting-to-lame-https-server problem, and a + getting-stuck-in-a-loop-reconnecting bug that it revealed. + [#615535] + + * Fixed an invalid read when parsing certain Cookie headers + [#620288] + + * Fixed a memory leak in soup_form_request_from_data [#619897] + + * Failed SSL connections now include the correct reason_phrase + ("SSL handshake failed" rather than "SSL support not + available"). + Changes in libsoup from 2.30.0 to 2.30.1: * Fix for https through proxies that close the connection when diff -Nru libsoup2.4-2.30.1/tests/date.c libsoup2.4-2.30.2/tests/date.c --- libsoup2.4-2.30.1/tests/date.c 2009-10-21 22:29:23.000000000 +0100 +++ libsoup2.4-2.30.2/tests/date.c 2010-06-22 17:24:12.000000000 +0100 @@ -13,6 +13,23 @@ static gboolean check_ok (const char *strdate, SoupDate *date); +static SoupDate * +make_date (const char *strdate) +{ + char *dup; + SoupDate *date; + + /* We do it this way so that if soup_date_new_from_string() + * reads off the end of the string, it will trigger an error + * when valgrinding, rather than just reading the start of the + * next const string. + */ + dup = g_strdup (strdate); + date = soup_date_new_from_string (dup); + g_free (dup); + return date; +} + static const struct { SoupDateFormat format; const char *date; @@ -31,7 +48,7 @@ SoupDate *date; char *strdate2; - date = soup_date_new_from_string (strdate); + date = make_date (strdate); if (date) strdate2 = soup_date_to_string (date, format); if (!check_ok (strdate, date)) @@ -282,7 +299,7 @@ char *str; debug_printf (2, "%s\n", conv->source); - date = soup_date_new_from_string (conv->source); + date = make_date (conv->source); if (!date) { debug_printf (1, " date parsing failed for '%s'.\n", conv->source); errors++; @@ -359,12 +376,12 @@ debug_printf (1, "\nOK dates:\n"); for (i = 0; i < G_N_ELEMENTS (ok_dates); i++) - check_ok (ok_dates[i], soup_date_new_from_string (ok_dates[i])); + check_ok (ok_dates[i], make_date (ok_dates[i])); check_ok (TIME_T_STRING, soup_date_new_from_time_t (TIME_T)); debug_printf (1, "\nBad dates:\n"); for (i = 0; i < G_N_ELEMENTS (bad_dates); i++) - check_bad (bad_dates[i], soup_date_new_from_string (bad_dates[i])); + check_bad (bad_dates[i], make_date (bad_dates[i])); debug_printf (1, "\nConversions:\n"); for (i = 0; i < G_N_ELEMENTS (conversions); i++) diff -Nru libsoup2.4-2.30.1/tests/libsoup.supp libsoup2.4-2.30.2/tests/libsoup.supp --- libsoup2.4-2.30.1/tests/libsoup.supp 2010-04-10 00:46:34.000000000 +0100 +++ libsoup2.4-2.30.2/tests/libsoup.supp 2010-06-22 18:07:17.000000000 +0100 @@ -7,12 +7,24 @@ fun:g_type_init } { + glib/g_type_init_with_debug_flags + Memcheck:Leak + ... + fun:g_type_init_with_debug_flags +} +{ glib/g_thread_init Memcheck:Leak ... fun:g_thread_init } { + glib/g_thread_init_glib + Memcheck:Leak + ... + fun:g_thread_init_glib +} +{ glib/g_type_register_static Memcheck:Leak ... @@ -109,6 +121,12 @@ ... fun:g_resolver_get_default } +{ + glib/g_main_context_push_thread_default + Memcheck:Leak + ... + fun:g_main_context_push_thread_default +} # probably using uninitialized memory as padding or something { diff -Nru libsoup2.4-2.30.1/tests/misc-test.c libsoup2.4-2.30.2/tests/misc-test.c --- libsoup2.4-2.30.1/tests/misc-test.c 2010-04-10 00:46:34.000000000 +0100 +++ libsoup2.4-2.30.2/tests/misc-test.c 2010-06-22 16:58:44.000000000 +0100 @@ -194,6 +194,7 @@ soup_address_resolve_sync (addr, NULL); bad_server = soup_server_new (SOUP_SERVER_INTERFACE, addr, NULL); + g_object_unref (addr); bad_uri = g_strdup_printf ("http://127.0.0.1:%u/", soup_server_get_port (bad_server)); @@ -322,6 +323,9 @@ g_free (signal_ids); } +/* Server handlers for "*" work but are separate from handlers for + * all other URIs. #590751 + */ static void do_star_test (void) { @@ -382,6 +386,19 @@ soup_uri_free (star_uri); } +/* Handle unexpectedly-early aborts. #596074, #618641 */ +static void +ea_msg_completed_one (SoupSession *session, SoupMessage *msg, gpointer loop) +{ + debug_printf (2, " Message 1 completed\n"); + if (msg->status_code != SOUP_STATUS_CANCELLED) { + debug_printf (1, " Unexpected status on Message 1: %d %s\n", + msg->status_code, msg->reason_phrase); + errors++; + } + g_main_loop_quit (loop); +} + static gboolean ea_abort_session (gpointer session) { @@ -416,16 +433,32 @@ { SoupSession *session; SoupMessage *msg; + GMainContext *context; + GMainLoop *loop; debug_printf (1, "\nAbort with pending connection\n"); session = soup_test_session_new (SOUP_TYPE_SESSION_ASYNC, NULL); + msg = soup_message_new_from_uri ("GET", base_uri); + + context = g_main_context_default (); + loop = g_main_loop_new (context, TRUE); + soup_session_queue_message (session, msg, ea_msg_completed_one, loop); + g_main_context_iteration (context, FALSE); + + soup_session_abort (session); + while (g_main_context_pending (context)) + g_main_context_iteration (context, FALSE); + g_main_loop_unref (loop); + soup_test_session_abort_unref (session); + session = soup_test_session_new (SOUP_TYPE_SESSION_ASYNC, NULL); msg = soup_message_new_from_uri ("GET", base_uri); g_signal_connect (session, "connection-created", G_CALLBACK (ea_connection_created), NULL); soup_session_send_message (session, msg); + debug_printf (2, " Message 2 completed\n"); if (msg->status_code != SOUP_STATUS_CANCELLED) { debug_printf (1, " Unexpected response: %d %s\n", @@ -434,6 +467,9 @@ } g_object_unref (msg); + while (g_main_context_pending (context)) + g_main_context_iteration (context, FALSE); + soup_test_session_abort_unref (session); } diff -Nru libsoup2.4-2.30.1/tests/redirect-test.c libsoup2.4-2.30.2/tests/redirect-test.c --- libsoup2.4-2.30.1/tests/redirect-test.c 2010-04-10 00:46:34.000000000 +0100 +++ libsoup2.4-2.30.2/tests/redirect-test.c 2010-06-22 17:00:13.000000000 +0100 @@ -18,6 +18,7 @@ const char *method; const char *path; guint status_code; + gboolean repeat; } TestRequest; static struct { @@ -107,7 +108,10 @@ /* Test behavior with irrecoverably-bad Location header */ { { { "GET", "/bad-no-host", 302 }, - { NULL } }, SOUP_STATUS_MALFORMED } + { NULL } }, SOUP_STATUS_MALFORMED }, + + { { { "GET", "/bad-recursive", 302, TRUE }, + { NULL } }, SOUP_STATUS_TOO_MANY_REDIRECTS } }; static const int n_tests = G_N_ELEMENTS (tests); @@ -142,7 +146,7 @@ debug_printf (2, " %s %s\n", msg->method, uri->path); - if ((*req)->method) + if ((*req)->method && !(*req)->repeat) (*req)++; if (!(*req)->method) { @@ -234,6 +238,11 @@ soup_message_headers_replace (msg->response_headers, "Location", "/bad with spaces"); + } else if (!strcmp (path, "/bad-recursive")) { + soup_message_set_status (msg, SOUP_STATUS_FOUND); + soup_message_headers_replace (msg->response_headers, + "Location", + "/bad-recursive"); } else if (!strcmp (path, "/bad-no-host")) { soup_message_set_status (msg, SOUP_STATUS_FOUND); soup_message_headers_replace (msg->response_headers, diff -Nru libsoup2.4-2.30.1/tests/sniffing-test.c libsoup2.4-2.30.2/tests/sniffing-test.c --- libsoup2.4-2.30.1/tests/sniffing-test.c 2010-04-10 00:51:33.000000000 +0100 +++ libsoup2.4-2.30.2/tests/sniffing-test.c 2010-06-22 17:24:12.000000000 +0100 @@ -445,6 +445,24 @@ g_main_loop_unref (loop); } +/* Fix up XDG_DATA_DIRS for jhbuild runs so that it still works even + * if you didn't install shared-mime-info. + */ +static void +fixup_xdg_dirs (void) +{ + const char *xdg_data_dirs = g_getenv ("XDG_DATA_DIRS"); + char *new_data_dirs; + + if (xdg_data_dirs && + !g_str_has_prefix (xdg_data_dirs, "/usr/share") && + !strstr (xdg_data_dirs, ":/usr/share")) { + new_data_dirs = g_strdup_printf ("%s:/usr/share", xdg_data_dirs); + g_setenv ("XDG_DATA_DIRS", new_data_dirs, TRUE); + g_free (new_data_dirs); + } +} + int main (int argc, char **argv) { @@ -452,6 +470,8 @@ test_init (argc, argv, NULL); + fixup_xdg_dirs (); + server = soup_test_server_new (TRUE); soup_server_add_handler (server, NULL, server_callback, NULL, NULL); base_uri = soup_uri_new ("http://127.0.0.1/"); diff -Nru libsoup2.4-2.30.1/tests/test-utils.c libsoup2.4-2.30.2/tests/test-utils.c --- libsoup2.4-2.30.1/tests/test-utils.c 2010-04-10 00:46:34.000000000 +0100 +++ libsoup2.4-2.30.2/tests/test-utils.c 2010-06-22 18:07:17.000000000 +0100 @@ -291,6 +291,7 @@ SOUP_SERVER_SSL_CERT_FILE, ssl_cert_file, SOUP_SERVER_SSL_KEY_FILE, ssl_key_file, NULL); + g_object_unref (addr); if (async_context) g_main_context_unref (async_context);