[libsoup/cache: 37/40] Merge branch 'master' into cache

[Xan Lopez <xan src gnome org>]

commit 698d9017fb7feab33ed4a36689bb3b86e2b7da80
Merge: 5e49d54... fd5b785...
Author: Xan Lopez <xan gnome org>
Date:   Thu Jul 23 16:26:51 2009 +0300

    Merge branch 'master' into cache
    
    Conflicts:
    	libsoup/Makefile.am
    	libsoup/soup-session-private.h
    	libsoup/soup-session.c
    	libsoup/soup.h

 .gitignore                          |    1 +
 HACKING                             |   66 ++++
 NEWS                                |   85 +++++-
 autogen.sh                          |    2 +-
 configure.in                        |   41 ++-
 libsoup/Makefile.am                 |    4 +
 libsoup/soup-auth-digest.c          |    6 +-
 libsoup/soup-auth-manager.c         |   54 ++--
 libsoup/soup-connection.c           |  480 +++++++++-------------------
 libsoup/soup-connection.h           |   29 +-
 libsoup/soup-content-sniffer.c      |  605 +++++++++++++++++++++++++++++++++++
 libsoup/soup-content-sniffer.h      |   57 ++++
 libsoup/soup-dns.c                  |    4 +-
 libsoup/soup-form.c                 |    2 +-
 libsoup/soup-gnutls.c               |   15 +-
 libsoup/soup-marshal.list           |    1 +
 libsoup/soup-message-client-io.c    |    3 +-
 libsoup/soup-message-headers.c      |   39 ++-
 libsoup/soup-message-io.c           |   93 ++++++-
 libsoup/soup-message-private.h      |    4 +
 libsoup/soup-message-queue.c        |   24 ++-
 libsoup/soup-message-queue.h        |    8 +-
 libsoup/soup-message.c              |   62 ++++-
 libsoup/soup-message.h              |    1 +
 libsoup/soup-method.h               |   33 +-
 libsoup/soup-misc.c                 |   57 ----
 libsoup/soup-misc.h                 |    2 +
 libsoup/soup-proxy-resolver-gnome.c |  184 ++++++------
 libsoup/soup-proxy-resolver-gnome.h |    1 -
 libsoup/soup-proxy-resolver.c       |  164 ++++++++--
 libsoup/soup-proxy-resolver.h       |    4 +
 libsoup/soup-proxy-uri-resolver.c   |   97 ++++++
 libsoup/soup-proxy-uri-resolver.h   |   57 ++++
 libsoup/soup-session-async.c        |  178 +++++++----
 libsoup/soup-session-private.h      |   31 ++-
 libsoup/soup-session-sync.c         |  115 ++++---
 libsoup/soup-session.c              |  285 +++++++++--------
 libsoup/soup-socket.c               |   29 ++
 libsoup/soup-uri.c                  |   82 +++++-
 libsoup/soup-uri.h                  |   12 +-
 libsoup/soup-value-utils.h          |    2 +-
 libsoup/soup-xmlrpc.h               |    2 +-
 libsoup/soup.h                      |    1 +
 tests/Makefile.am                   |   29 ++-
 tests/auth-test.c                   |   72 ++++-
 tests/get.c                         |  198 +-----------
 tests/proxy-test.c                  |    2 +-
 tests/redirect-test.c               |    3 +-
 tests/resources/atom.xml            |   35 ++
 tests/resources/home.gif            |  Bin 0 -> 995 bytes
 tests/resources/mbox                |   64 ++++
 tests/resources/rss20.xml           |   26 ++
 tests/resources/test.html           |   10 +
 tests/sniffing-test.c               |  481 ++++++++++++++++++++++++++++
 54 files changed, 2861 insertions(+), 1081 deletions(-)
---
diff --cc libsoup/Makefile.am
index ef05b72,2d3a6ea..ad9a735
--- a/libsoup/Makefile.am
+++ b/libsoup/Makefile.am
@@@ -55,7 -55,7 +55,8 @@@ soup_headers =			
  	soup-auth-domain.h	\
  	soup-auth-domain-basic.h  \
  	soup-auth-domain-digest.h \
 +	soup-cache.h		\
+ 	soup-content-sniffer.h  \
  	soup-cookie.h		\
  	soup-cookie-jar.h	\
  	soup-cookie-jar-text.h	\
@@@ -117,9 -118,9 +119,10 @@@ libsoup_2_4_la_SOURCES =		
  	soup-auth-manager.c		\
  	soup-auth-manager-ntlm.h	\
  	soup-auth-manager-ntlm.c	\
 +	soup-cache.c			\
  	soup-connection.h		\
  	soup-connection.c		\
+ 	soup-content-sniffer.c		\
  	soup-cookie.c			\
  	soup-cookie-jar.c		\
  	soup-cookie-jar-text.c		\
diff --cc libsoup/soup-session-private.h
index 015704f,765ea06..591161f
--- a/libsoup/soup-session-private.h
+++ b/libsoup/soup-session-private.h
@@@ -15,17 -14,23 +15,24 @@@
  G_BEGIN_DECLS
  
  /* "protected" methods for subclasses */
- SoupMessageQueue *soup_session_get_queue            (SoupSession *session);
- 
- SoupConnection   *soup_session_get_connection       (SoupSession *session,
- 						     SoupMessage *msg,
- 						     SoupAddress *proxy,
- 						     gboolean    *try_pruning,
- 						     gboolean    *is_new);
- gboolean          soup_session_try_prune_connection (SoupSession *session);
- 
- SoupProxyResolver *soup_session_get_proxy_resolver  (SoupSession *session);
- SoupCache         *soup_session_get_cache           (SoupSession *session);
+ SoupMessageQueue     *soup_session_get_queue            (SoupSession          *session);
+ 
+ SoupMessageQueueItem *soup_session_make_connect_message (SoupSession          *session,
+ 							 SoupAddress          *server_addr);
+ SoupConnection       *soup_session_get_connection       (SoupSession          *session,
+ 							 SoupMessageQueueItem *item,
+ 							 gboolean             *try_pruning);
+ gboolean              soup_session_try_prune_connection (SoupSession          *session);
+ void                  soup_session_connection_failed    (SoupSession          *session,
+ 							 SoupConnection       *conn,
+ 							 guint                 status);
+ 
+ SoupProxyURIResolver *soup_session_get_proxy_resolver   (SoupSession          *session);
+ 
+ void                  soup_session_send_queue_item      (SoupSession          *session,
+ 							 SoupMessageQueueItem *item,
+ 							 SoupConnection       *conn);
++SoupCache             *soup_session_get_cache           (SoupSession *session);
  
  G_END_DECLS
  
diff --cc libsoup/soup-session.c
index b8841b3,3c824d5..992e305
--- a/libsoup/soup-session.c
+++ b/libsoup/soup-session.c
@@@ -65,8 -67,7 +68,8 @@@ typedef struct 
  } SoupSessionHost;
  
  typedef struct {
- 	SoupProxyResolver *proxy_resolver;
+ 	SoupProxyURIResolver *proxy_resolver;
 +	SoupCache *cache;
  
  	char *ssl_ca_file;
  	SoupSSLCredentials *ssl_creds;
@@@ -1494,11 -1498,8 +1500,10 @@@ soup_session_add_feature (SoupSession *
  	priv->features = g_slist_prepend (priv->features, g_object_ref (feature));
  	soup_session_feature_attach (feature, session);
  
- 	if (SOUP_IS_PROXY_RESOLVER (feature))
- 		priv->proxy_resolver = SOUP_PROXY_RESOLVER (feature);
- 
+ 	if (SOUP_IS_PROXY_URI_RESOLVER (feature))
+ 		priv->proxy_resolver = SOUP_PROXY_URI_RESOLVER (feature);
 +	if (SOUP_IS_CACHE (feature))
 +		priv->cache = SOUP_CACHE (feature);
  }
  
  /**
diff --cc libsoup/soup.h
index 4ac0991,ddb73f7..bfbea4e
--- a/libsoup/soup.h
+++ b/libsoup/soup.h
@@@ -15,7 -15,7 +15,8 @@@ extern "C" 
  #include <libsoup/soup-auth-domain.h>
  #include <libsoup/soup-auth-domain-basic.h>
  #include <libsoup/soup-auth-domain-digest.h>
 +#include <libsoup/soup-cache.h>
+ #include <libsoup/soup-content-sniffer.h>
  #include <libsoup/soup-cookie.h>
  #include <libsoup/soup-cookie-jar.h>
  #include <libsoup/soup-cookie-jar-text.h>