Joe Shaw [Fri, 9 Jan 2004 21:30:04 +0000 (21:30 +0000)]
Include the libgnutls.m4 file.
2004-01-09 Joe Shaw <joe@ximian.com>
* acinclude.m4: Include the libgnutls.m4 file.
* configure.in: Remove manual checking for libgnutls-config and
use the AM_PATH_LIBGNUTLS so we can pass in a minimum required
version, which is 0.9.7 for now.
* libsoup/Makefile.am: Some changes for the above change.
* libsoup/soup-gnutls.c: Check for HAVE_SSL, not
HAVE_GNUTLS_GNUTLS_H.
(verify_certificate): Uncomment the SSL certificate hostname
check.
* libsoup/soup-session.c (set_property): Be smart about flushing
our SSL credentials only when the CA file is set to something
different than it was before.
Harish Krishnaswamy [Fri, 9 Jan 2004 16:14:04 +0000 (16:14 +0000)]
allow soup_soap_response_from_string to ignore header element if present
while forming response objects in soup-soap-response.c
Harish Krishnaswamy [Fri, 9 Jan 2004 16:05:57 +0000 (16:05 +0000)]
added code to soup_soap_response_from_string to ignore header element
while forming response objects, if they are present.
Dan Winship [Mon, 5 Jan 2004 16:25:54 +0000 (16:25 +0000)]
Remove no-longer-relevant socklen_t check
* configure.in: Remove no-longer-relevant socklen_t check
* libsoup/soup-address.c: Reorder #includes for FreeBSD (From Joe
Marcus Clarke, #52566)
* libsoup/soup-dns.c: Likewise
JP Rosevear [Mon, 29 Dec 2003 15:23:03 +0000 (15:23 +0000)]
bump version and libtool number
2003-12-29 JP Rosevear <jpr@ximian.com>
* configure.in: bump version and libtool number
Dan Winship [Mon, 22 Dec 2003 18:49:49 +0000 (18:49 +0000)]
Update these
* README, TODO: Update these
Dan Winship [Mon, 22 Dec 2003 18:09:34 +0000 (18:09 +0000)]
Lots of thread-safety stuff, primarly so you can disconnect a socket from
* libsoup/soup-socket.c: Lots of thread-safety stuff, primarly so
you can disconnect a socket from one thread while doing I/O in
another.
* libsoup/soup-message-io.c (soup_message_io_cancel): Split into
soup_message_io_stop() and io_cleanup(), to separate out the "stop
reading/writing" and "free data" phases to allow thread-safe
synchronous cancellation.
(soup_message_io_finished): call both soup_message_io_stop() and
io_cleanup()
(io_error): Only set SOUP_STATUS_IO_ERROR on the message if it
doesn't already have a transport error status (eg, CANCELLED).
(new_iostate): Call io_cleanup() if needed.
* libsoup/soup-status.h: add "SOUP_STATUS_NONE" for 0, to make it
clearer that it's not a status.
* libsoup/soup-message.c (finalize, restarted, finished,
soup_message_set_uri): s/soup_message_io_cancel/soup_message_io_stop/
(soup_message_cleanup_response): s/0/SOUP_STATUS_NONE/
* libsoup/soup-connection.c (send_request): Remove
soup_message_io_cancel call.
* libsoup/soup-session-sync.c (send_message): Connect to the
connection's "disconnected" signal rather than using a weak ref,
since that's what we really care about, and it's possible that the
connection may have an extra ref on it somewhere that would keep
it from being destroyed even if it was disconnected.
Joe Shaw [Sat, 20 Dec 2003 17:54:59 +0000 (17:54 +0000)]
If const_path is NULL un the non-proxy case, then use the root ("/").
2003-12-20 Joe Shaw <joe@ximian.com>
* libsoup/soup-session.c (lookup_auth): If const_path is NULL un
the non-proxy case, then use the root ("/").
Dan Winship [Fri, 19 Dec 2003 20:54:38 +0000 (20:54 +0000)]
New. An interface for objects that want to act on every message passing
* libsoup/soup-message-filter.c: New. An interface for objects
that want to act on every message passing through a session.
(Initially being used for authentication, but could also be used
for cache handling, cookie management, etc.)
* libsoup/soup-connection.c (class_init, etc): Add a message
filter property.
(send_request): If the connection has a message filter set, run
it on the message before sending it.
(soup_connection_connect_async, etc): When setting up a tunnel, if
we get back a 407 and the session tries to requeue the message,
either re-send it, or return SOUP_STATUS_TRY_AGAIN (depending on
whether or not the proxy closed the connection).
(soup_connection_connect_sync): Likewise
(send_request, request_done): Ref/unref the connection
* libsoup/soup-session.c (soup_session_get_type): Implement the
SoupMessageFilter interface.
(soup_session_get_connection): Use the session as the connection's
message filter
(soup_session_add_filter, soup_session_remove_filter): Add/remove
filters from the session
(setup_message): do auth handling, and call each of the session's
filters' setup_message methods as well.
(soup_session_send_message_via): No longer needed.
(connect_result): Handle SOUP_STATUS_TRY_AGAIN.
* libsoup/soup-session-async.c (run_queue): Use
soup_connection_send_request, since soup_session_send_message_via
is gone now.
* libsoup/soup-session-sync.c (send_message): Likewise
* libsoup/soup-message.c (soup_message_is_keepalive): A successful
response to a CONNECT is always keepalive, even if it's HTTP/1.0
with no Connection header.
* libsoup/soup-status.h: add SOUP_STATUS_TRY_AGAIN
* libsoup/soup-types.h: Add SoupMessageFilter, and macros for
gobject interface types.
* tests/get.c (main): Add a -p flag to specify a proxy
* tests/simple-proxy.c: Fix #includes
Dan Winship [Thu, 18 Dec 2003 21:36:01 +0000 (21:36 +0000)]
Actually disconnect the socket rather than just unreffing it, since the IO
* libsoup/soup-connection.c (soup_connection_disconnect): Actually
disconnect the socket rather than just unreffing it, since the IO
code may be holding an extra ref on it.
(send_request): connect to the "restarted" signal too
(request_restarted): Deal with "Connection: close"
* libsoup/soup-connection-ntlm.c (ntlm_authorize_pre): Make this
not go into an infinite loop if the server only supports Basic.
Dan Winship [Wed, 17 Dec 2003 21:18:09 +0000 (21:18 +0000)]
comment out some code that doesn't work currently
Rodrigo Moya [Wed, 17 Dec 2003 20:13:40 +0000 (20:13 +0000)]
install soup-message-queue.h with the rest
2003-12-17 Rodrigo Moya <rodrigo@ximian.com>
* libsoup/Makefile.am: install soup-message-queue.h with the rest
Dan Winship [Wed, 17 Dec 2003 20:01:41 +0000 (20:01 +0000)]
remove some dead code to make this compile
Dan Winship [Wed, 17 Dec 2003 19:49:14 +0000 (19:49 +0000)]
Add gthread to glib check
* configure.in: Add gthread to glib check
* libsoup/soup-session.c: Make this an abstract class.
* libsoup/soup-session-async.c: A SoupSession class for
asynchronous gmain-based operation; replaces the old SoupSession.
* libsoup/soup-session-sync.c: A SoupSession class for synchronous
blocking operation for use with threaded apps.
* libsoup/soup-types.h, libsoup/soup.h: add the new session
subclasses
* libsoup/soup-connection.c (soup_connection_connect_sync): Don't
try to unref the socket if the socket creation fails.
(soup_connection_reserve): New, to explicitly mark a connection as
being in use without queueing a message on it.
* libsoup/soup-dns.c (check_hostent): Oof. Fix the logic of the
"block" flag to not be reversed.
* libsoup/soup-message.c (finished): set status to FINISHED here.
(soup_message_cancel): Gone; needs to be done at the session
level.
* libsoup/soup-message-queue.c: Add a mutex and make all of the
operations thread-safe.
* libsoup/soup-socket.c (disconnect_internal): Make this
thread-safe.
(soup_socket_connect): Make the sync case work correctly.
* libsoup/Makefile.am: add the SoupSession subclasses
* tests/Makefile.am: libsoup depends on libgthread now, so
revserver doesn't need to explicitly.
* tests/get.c, tests/auth-test.c, tests/simple-proxy.c: Use
soup_session_async_new().
Rodrigo Moya [Tue, 16 Dec 2003 17:42:56 +0000 (17:42 +0000)]
new function.
2003-12-16 Rodrigo Moya <rodrigo@ximian.com>
* libsoup/soup-soap-response.[ch] (soup_soap_parameter_get_int_value):
new function.
Rodrigo Moya [Tue, 16 Dec 2003 17:42:32 +0000 (17:42 +0000)]
new function.
2003-12-16 Rodrigo Moya <rodrigo@ximian.com>
* libsoup/soup-soap-response.[ch] (soup_soap_parameter_get_int_value):
new function.
Joe Shaw [Tue, 16 Dec 2003 17:33:00 +0000 (17:33 +0000)]
Only set up a tunnel if the destination protocol is HTTPS.
2003-12-16 Joe Shaw <joe@ximian.com>
* libsoup/soup-connection.c (socket_connect_result,
soup_connection_connect_sync): Only set up a tunnel if the
destination protocol is HTTPS.
* libsoup/soup-message.c (class_init): Add a default handler for
wrote_body.
(wrote_body): Run the SOUP_HANDLER_POST_REQUEST handlers here.
(soup_message_cancel): Don't set the status to
SOUP_STATUS_CANCELLED and call soup_message_finished() if the
status is already SOUP_MESSAGE_STATUS_FINISHED.
* libsoup/soup-session.c (set_property): Don't cancel the session
if the proxy URI set as a property isn't different from the old
one.
(get_host_for_message): Refactor some code so that we can easily
get the right SoupSessionHost for proxies as well as from the
message.
(authenticate_auth): Take a gboolean proxy parameter. Check it to
see which URI (message URI or proxy URI) to use for
authentication. Add a long comment about lack of clarity in RFC
2617 with respect to proxies and protection spaces.
Dan Winship [Mon, 15 Dec 2003 14:04:14 +0000 (14:04 +0000)]
s/guint/gsize/ to match the definitions in soup-socket.c. #52167.
* libsoup/soup-socket.h (soup_socket_read, soup_socket_read_until,
soup_socket_write): s/guint/gsize/ to match the definitions in
soup-socket.c. #52167.
Rodrigo Moya [Fri, 12 Dec 2003 15:23:04 +0000 (15:23 +0000)]
removed debugging of the messages here.
2003-12-12 Rodrigo Moya <rodrigo@ximian.com>
* libsoup/soup-soap-message.c: removed debugging of the messages here.
Rodrigo Moya [Fri, 12 Dec 2003 13:54:54 +0000 (13:54 +0000)]
added information for SOAP-ENV namespace.
2003-12-12 Rodrigo Moya <rodrigo@ximian.com>
* libsoup/soup-soap-message.c (soup_soap_message_start_envelope):
added information for SOAP-ENV namespace.
Dan Winship [Wed, 10 Dec 2003 18:35:25 +0000 (18:35 +0000)]
if we receive an HTTP/1.0 response to an HTTP/1.1 request, downgrade the
* libsoup/soup-message-client-io.c (parse_response_headers): if we
receive an HTTP/1.0 response to an HTTP/1.1 request, downgrade the
message's http_version so the keep-alive handling is correct.
Fixes a problem noticed almost simultaneously by Rodrigo and Joe.
* libsoup/soup-message.c (soup_message_restarted, etc): Add a
"restarted" signal as suggested by Joe.
* libsoup/soup-message-io.c (soup_message_io_finished): emit
either "restarted" or "finished" as appropriate
* libsoup/soup-session.c (soup_session_queue_message): Connect to
"restarted" and run the queue if a message gets restarted
* libsoup/soup-status.h: Remove a stray comma that gtk-doc doesn't
like.
Tambet Ingo [Wed, 10 Dec 2003 17:45:26 +0000 (17:45 +0000)]
Use autoconfig to check for socklen_t ...
2003-12-10 Tambet Ingo <tambet@ximian.com>
* configure.in: Use autoconfig to check for socklen_t ...
* libsoup/soup-address.c: ... and remove it from here ...
* libsoup/soup-dns.c: ... and here.
Rodrigo Moya [Tue, 9 Dec 2003 17:45:58 +0000 (17:45 +0000)]
print out request/response's contents, if in debug mode.
2003-12-09 Rodrigo Moya <rodrigo@ximian.com>
* libsoup/soup-soap-message.c (soup_soap_message_persist):
(soup_soap_message_parse_response): print out request/response's
contents, if in debug mode.
JP Rosevear [Sun, 7 Dec 2003 18:27:48 +0000 (18:27 +0000)]
Bump version
2003-12-07 JP Rosevear <jpr@ximian.com>
* configure.in: Bump version
Rodrigo Moya [Fri, 28 Nov 2003 11:58:04 +0000 (11:58 +0000)]
new functions to manage SoupSoapParameter's children.
2003-11-28 Rodrigo Moya <rodrigo@ximian.com>
* libsoup/soup-soap-response.[ch]
(soup_soap_parameter_get_first_child,
soup_soap_parameter_get_first_child_by_name,
soup_soap_parameter_get_next_child,
soup_soap_parameter_get_next_child_by_name): new functions to
manage SoupSoapParameter's children.
(soup_soap_response_get_first_parameter): dont return a GList, but
a SoupSoapParameter contained in the GList.
Rodrigo Moya [Wed, 26 Nov 2003 15:48:59 +0000 (15:48 +0000)]
new function.
2003-11-26 Rodrigo Moya <rodrigo@ximian.com>
* libsoup/soup-soap-response.[ch]
(soup_soap_parameter_get_string_value): new function.
Rodrigo Moya [Wed, 26 Nov 2003 15:23:37 +0000 (15:23 +0000)]
added SoupSoapParameter structure, to "hide" the usage of xmlNode's.
2003-11-26 Rodrigo Moya <rodrigo@ximian.com>
* libsoup/soup-soap-response.[ch]: added SoupSoapParameter
structure, to "hide" the usage of xmlNode's.
(soup_soap_parameter_get_name): functions to manage SOAP
response parameters.
(soup_soap_response_get_first_parameter,
soup_soap_response_get_first_parameter_by_name,
soup_soap_response_get_next_parameter,
soup_soap_response_get_next_parameter_by_name):
new functions for an easy access to the response's parameters.
(soup_soap_response_from_string): removed warnings.
Rodrigo Moya [Tue, 25 Nov 2003 22:45:23 +0000 (22:45 +0000)]
fixed typo.
2003-11-25 Rodrigo Moya <rodrigo@ximian.com>
* libsoup/soup-soap-response.c (soup_soap_response_set_method_name):
fixed typo.
Rodrigo Moya [Tue, 25 Nov 2003 22:05:34 +0000 (22:05 +0000)]
new functions. (finalize): NULL out new private fields.
2003-11-25 Rodrigo Moya <rodrigo@ximian.com>
* libsoup/soup-soap-response.[ch] (soup_soap_response_get_method_name,
soup_soap_response_set_method_name, soup_soap_message_get_parameters):
new functions.
(finalize): NULL out new private fields.
(soup_soap_response_from_string): added validation code.
Rodrigo Moya [Mon, 24 Nov 2003 17:50:17 +0000 (17:50 +0000)]
new class for managing SOAP responses.
2003-11-23 Rodrigo Moya <rodrigo@ximian.com>
* libsoup/soup-soap-response.[ch]: new class for managing SOAP
responses.
* libsoup/soup-soap-message.[ch] (soup_soap_message_parse_response):
new function.
* libsoup/Makefile.am: added new files.
Rodney Dawes [Tue, 18 Nov 2003 22:17:01 +0000 (22:17 +0000)]
Add gtk-doc.make to cvs for systems without gtk-doc
2003-11-18 Rodney Dawes <dobey@ximian.com>
* gtk-doc.make: Add gtk-doc.make to cvs for systems without gtk-doc
Rodney Dawes [Tue, 18 Nov 2003 21:43:01 +0000 (21:43 +0000)]
Add GTK_DOC_CHECK
2003-11-18 Rodney Dawes <dobey@ximian.com>
* acinclude.m4: Add GTK_DOC_CHECK
Dan Winship [Tue, 18 Nov 2003 20:15:22 +0000 (20:15 +0000)]
Replace old gtk-doc test with GTK_DOC_CHECK() (AC_OUTPUT): add
* configure.in: Replace old gtk-doc test with GTK_DOC_CHECK()
(AC_OUTPUT): add docs/Makefile, docs/reference/Makefile
* autogen.sh (REQUIRED_AUTOMAKE_VERSION): 1.6, for gtk-doc.make
* Makefile.am: updates for gtk-doc
(SUBDIRS): add back "docs"
* docs/Makefile.am (EXTRA_DIST): remove, since those old docs
aren't around any more
* docs/reference/*: set up gtk-doc
* libsoup/Makefile.am (INCLUDES): Change G_LOG_DOMAIN to
"libsoup". Remove unused defines.
* libsoup/soup-connection.c: Fix doc comments
* libsoup/soup-message.c: Likewise
* libsoup/soup-misc.c: Likewise
* libsoup/soup-socket.c: Likewise
* libsoup/soup-uri.c: Likewise
* libsoup/soup-address.h: Fixes to please gtk-doc
* libsoup/soup-connection.h: Likewise
* libsoup/soup-message.h: Likewise
* libsoup/soup-message-private.h: Likewise
* libsoup/soup-misc.h: Likewise
* libsoup/soup-server-auth.h: Likewise
* libsoup/soup-socket.h: Likewise
* libsoup/soup-status.h: Likewise
Dan Winship [Tue, 18 Nov 2003 20:01:00 +0000 (20:01 +0000)]
fix last fix
Dan Winship [Tue, 18 Nov 2003 20:00:08 +0000 (20:00 +0000)]
Change G_LOG_DOMAIN to "libsoup". Remove unused defines.
* libsoup/Makefile.am (INCLUDES): Change G_LOG_DOMAIN to
"libsoup". Remove unused defines.
* libsoup/soup-connection.c: Fix doc comments
* libsoup/soup-message.c: Likewise
* libsoup/soup-misc.c: Likewise
* libsoup/soup-socket.c: Likewise
* libsoup/soup-uri.c: Likewise
* libsoup/soup-address.h: Fixes to please gtk-doc
* libsoup/soup-connection.h: Likewise
* libsoup/soup-message.h: Likewise
* libsoup/soup-message-private.h: Likewise
* libsoup/soup-misc.h: Likewise
* libsoup/soup-server-auth.h: Likewise
* libsoup/soup-socket.h: Likewise
Dan Winship [Tue, 18 Nov 2003 19:31:49 +0000 (19:31 +0000)]
fix
Dan Winship [Tue, 18 Nov 2003 19:11:55 +0000 (19:11 +0000)]
Fix up the SSL checks some. Remove some useless old header checks.
* configure.in: Fix up the SSL checks some. Remove some useless
old header checks.
Dan Winship [Tue, 18 Nov 2003 16:00:21 +0000 (16:00 +0000)]
declare soup_ssl_supported.
* libsoup/soup-misc.h: declare soup_ssl_supported.
* libsoup/soup-gnutls.c: add soup_ssl_supported declaration.
* libsoup/soup-nossl.c: Not an SSL implementation, built if
HAVE_SSL is not defined.
* libsoup/Makefile.am (libsoup_2_2_la_SOURCES): add soup-nossl.c
* libsoup/soup-socket.c (soup_socket_start_ssl): Return success or
failure.
(listen_watch): Deal with soup_socket_start_ssl failing.
* libsoup/soup-connection.c (tunnel_connect_finished,
socket_connect_result, soup_connection_connect_sync): Deal with
the soup_socket_start_ssl failing.
* libsoup/soup-server.c (soup_server_new): Deal with
soup_ssl_get_server_credentials failing
Rodrigo Moya [Tue, 18 Nov 2003 01:28:59 +0000 (01:28 +0000)]
new functions from old SoupSerializer.
2003-11-18 Rodrigo Moya <rodrigo@ximian.com>
* libsoup/soup-soap-message.[ch] (soup_soap_message_start_fault,
soup_soap_message_end_fault, soup_soap_message_start_fault_detail,
soup_soap_message_end_fault_detail, soup_soap_message_start_header,
soup_soap_message_end_header,
soup_soap_message_start_header_element,
soup_soap_message_end_header_element, soup_soap_message_write_int,
soup_soap_message_write_double, soup_soap_message_write_base64,
soup_soap_message_write_time, soup_soap_message_write_string,
soup_soap_message_write_buffer, soup_soap_message_set_element_type,
soup_soap_message_set_null, soup_soap_message_add_attribute,
soup_soap_message_add_namespace,
soup_soap_message_set_default_namespace,
soup_soap_message_get_namespace_prefix,
soup_soap_message_set_encoding_style, soup_soap_message_reset,
soup_soap_message_persist): new functions from old SoupSerializer.
Rodrigo Moya [Mon, 17 Nov 2003 23:14:32 +0000 (23:14 +0000)]
added a bunch of initialization parameters.
2003-11-17 Rodrigo Moya <rodrigo@ximian.com>
* libsoup/soup-soap-message.[ch] (soup_soap_message_new,
soup_soap_message_new_from_uri): added a bunch of initialization
parameters.
(soup_soap_message_get_xml_doc, soup_soap_message_start_envelope,
soup_soap_message_end_envelope, soup_soap_message_start_body,
soup_soap_message_end_body, soup_soap_message_start_element,
soup_soap_message_end_element):
new functions.
* configure.in: depend on libxml-2.0 for the SOAP code.
* libsoup/Makefile.am: use XML CFLAGS and LIBS.
Joe Shaw [Mon, 17 Nov 2003 21:01:52 +0000 (21:01 +0000)]
Add in the --enable-libgpg-error flag from the 2.0 branch.
2003-11-17 Joe Shaw <joe@ximian.com>
* configure.in: Add in the --enable-libgpg-error flag from the 2.0
branch.
* acinclude.m4: Include the gpg-error macros.
Rodrigo Moya [Mon, 17 Nov 2003 19:36:33 +0000 (19:36 +0000)]
new class to make it easier to build SOAP messages.
2003-11-17 Rodrigo Moya <rodrigo@ximian.com>
* libsoup/soup-soap-message.[ch]: new class to make it easier to
build SOAP messages.
* libsoup/Makefile.am: added new files.
* configure.in: increased version number.
Joe Shaw [Fri, 24 Oct 2003 17:15:17 +0000 (17:15 +0000)]
Call soup_dns_entry_get_hostent() on the SoupAddress passed in, not the
2003-10-24 Joe Shaw <joe@ximian.com>
* libsoup/soup-address.c (update_address_from_entry): Call
soup_dns_entry_get_hostent() on the SoupAddress passed in, not the
one in addr->priv->lookup. Fixes a crash on synchronous DNS
lookups.
* libsoup/soup-server.c (soup_server_new): We need to ref the
address we're binding to, because soup_socket_get_local_address()
doesn't ref for us.
Joe Shaw [Fri, 24 Oct 2003 15:01:56 +0000 (15:01 +0000)]
*** empty log message ***
Dan Winship [Thu, 23 Oct 2003 20:23:46 +0000 (20:23 +0000)]
Initialize flags to default values.
* libsoup/soup-socket.c (init): Initialize flags to default
values.
Dan Winship [Tue, 23 Sep 2003 19:35:44 +0000 (19:35 +0000)]
Remove refcounting, but note whether or not the CA file has been loaded.
* libsoup/soup-gnutls.c (SoupGNUTLSCred): Remove refcounting, but
note whether or not the CA file has been loaded.
(SoupGNUTLSChannel): add a "hostname" field.
(verify_certificate): Remove the comment about not being able to
verify the hostname because of soup problems. Now it's because of
GNUTLS problems instead.
(soup_ssl_wrap_iochannel): Renamed from soup_ssl_get_iochannel,
and takes a hostname and a creds argument now.
(soup_ssl_get_client_credentials,
soup_ssl_get_server_credentials): Return client/server credentials
structures.
(soup_ssl_free_client_credentials,
soup_ssl_free_server_credentials): and free them.
* libsoup/soup-session.c (class_init, set_property, get_property):
add ssl_ca_file property
(get_host_for_message): when returning an SSL host for the first
time, create a client credentials structure for the session.
(run_queue): Pass the ssl creds to the new connection. Also fix an
unrelated bug that caused infinite loops on "bad hostname".
* libsoup/soup-server.c: Use GObject properties, including
ssl_cert_file and ssl_key_file properties.
(soup_server_new): Remove "protocol" argument; if the cert file
and key file properties were set, create a server credential
structure from them and pass that to soup_socket_server_new.
* libsoup/soup-connection.c (SoupConnectionPrivate): Rename
dest_uri to origin_uri to match RFC 2616 terminology. Add an
"ssl_creds" field.
(class_init, set_property, get_property): add SSL_CREDS property
(soup_connection_connect_async, soup_connection_connect_sync):
Pass ssl_creds to soup_socket_client_new calls.
* libsoup/soup-socket.c: Use GObject properties, including an
ssl_creds property
(soup_socket_set_flags): Gone (replaced with boolean properties)
(soup_socket_new): Make this take a list of properties
(listen_watch): copy ssl creds from listener to new socket
(soup_socket_start_ssl): Pass remote hostname and socket creds
structure to soup_ssl_wrap_iochannel.
(soup_socket_client_new_async, soup_socket_client_new_sync,
soup_socket_server_new): Replace the SSL boolean with an ssl_creds
structure.
* libsoup/soup-misc.c (soup_set_ssl_ca_file,
soup_set_ssl_cert_files, soup_get_ssl_ca_file,
soup_get_ssl_cert_files): Gone. SSL state is now per-session or
per-server.
* tests/get.c: add a "-c CAfile" argument, for loading a CA
certificate file to validate https connections against
* tests/simple-httpd.c: Add "-c certfile" and "-k keyfile"
arguments for loading an SSL server certificate. Only start an SSL
server if those arguments were used.
* tests/test-cert.pem:
* tests/test-key.pem: SSL certificate for testing simple-httpd
* tests/revserver.c: Update for API changes
* tests/simple-proxy.c: Likewise
Dan Winship [Mon, 22 Sep 2003 20:10:45 +0000 (20:10 +0000)]
Move RESPONSE_BLOCK_SIZE #define here from soup-private.h
* libsoup/soup-message-io.c: Move RESPONSE_BLOCK_SIZE #define here
from soup-private.h
* libsoup/soup-misc.c (soup_load_config, etc): Remove all this.
(soup_set_security_policy, soup_get_security_policy): Remove,
since the GNUTLS backend doesn't actually implement it.
(soup_set_ssl_ca_dir, soup_get_ssl_ca_dir): Likewise
* libsoup/soup-misc.h: sync to soup-misc.c. Don't #include extra
stuff.
* libsoup/soup-types.h (SOUP_MAKE_TYPE): Move this here from
soup-private.h
* libsoup/soup-ssl.h: Merge soup_ssl_get_iochannel and
soup_ssl_get_server_iochannel into a single function that takes a
SoupSSLType.
* libsoup/soup-gnutls.c: Remove soup_get_ssl_ca_dir() reference.
(soup_ssl_get_iochannel): Renamed from soup_gnutls_get_iochannel.
(soup_gnutls_set_security_policy): Gone
* libsoup/soup-gnutls.h
* libsoup/soup-ssl.c: Gone; soup-ssl.h is the #include file for
soup-gnutls.c now
* libsoup/soup-socket.c: Move soup_sockaddr_max
#define here from soup-private.h
(soup_socket_start_ssl): Update for new soup_ssl_get_iochannel
prototype.
* libsoup/soup-private.h: Gone
* libsoup/soup-address.c: Fix #includes for soup-private.h and
soup-misc.h changes
* libsoup/soup-auth-digest.c: Likewise
* libsoup/soup-auth.c: Likewise
* libsoup/soup-connection-ntlm.c: Likewise
* libsoup/soup-connection.c: Likewise
* libsoup/soup-dns.c: Likewise
* libsoup/soup-gnutls.c: Likewise
* libsoup/soup-headers.c: Likewise
* libsoup/soup-message-client-io.c: Likewise
* libsoup/soup-message-handlers.c: Likewise
* libsoup/soup-message-io.c: Likewise
* libsoup/soup-message-server-io.c: Likewise
* libsoup/soup-message.c: Likewise
* libsoup/soup-server-message.c: Likewise
* libsoup/soup-server.c: Likewise
* libsoup/soup-session.c: Likewise
* libsoup/soup-socket.c: Likewise
* tests/auth-test.c: Likewise
Dan Winship [Fri, 19 Sep 2003 16:54:11 +0000 (16:54 +0000)]
free the hostent.
* libsoup/soup-address.c (update_address_from_entry): free the
hostent.
* libsoup/soup-connection-ntlm.c (ntlm_authorize_pre): Don't leak
the domain
* libsoup/soup-gnutls.c (soup_gnutls_get_iochannel): Add some more
iochannel initialization. Not sure how this worked before...
* libsoup/soup-message.c (soup_message_cleanup_response): Renamed
from soup_message_prepare (and a few things removed).
* libsoup/soup-message-client-io.c (soup_message_send_request):
s/soup_message_prepare/soup_message_cleanup_response/
* libsoup/soup-message-io.c (io_read): Replace the final "\r\n"
with "\0" on the headers before passing them to the parse
function.
(io_read): Call soup_message_cleanup_response after returning an
informational response so the data doesn't leak.
* libsoup/soup-headers.c (soup_headers_parse): Update for
soup-message-io.c:io_read change
* libsoup/soup-server.c (soup_server_new,
soup_server_new_with_host): Don't leak the SoupAddress.
* libsoup/soup-session.c (class_init): Make PROP_PROXY_URI not
CONSTRUCT_ONLY.
(set_property): If the proxy uri changes, call
soup_session_abort() and cleanup_hosts().
(request_finished, final_finished): Fix a bug when requeuing
messages.
* tests/libsoup.supp: valgrind suppression file for soup tests
* tests/Makefile.am (EXTRA_DIST): dist it.
(noinst_PROGRAMS): move the former check_PROGRAMS to
noinst_PROGRAMS instead.
Dan Winship [Thu, 18 Sep 2003 17:41:29 +0000 (17:41 +0000)]
Add wrote_informational and got_informational signals.
* libsoup/soup-message.c: Add wrote_informational and
got_informational signals.
* libsoup/soup-message-client-io.c (get_request_headers): Set the
EXPECT_CONTINUE flag on the message if that header is set.
* libsoup/soup-message-server-io.c (parse_request_headers):
Likewise
* libsoup/soup-message-io.c (io_write): Set read_state to HEADERS
when blocking on an expect-continue. Emit wrote_informational
instead of wrote_headers in the 1xx case.
(io_read): Set read_state to BLOCKING, not NOT_STARTED after
reading a 100 Continue response. Emit got_informational instead of
got_headers in the 1xx case.
* libsoup/soup-session.c (soup_session_send_message): Reorder
things to deal with the fact that the message could finish right
away if there is a connection available and the server is very
close.
* libsoup/soup-status.h: Rename SOUP_STATUS_CLASS_TRANSPORT to
SOUP_STATUS_CLASS_TRANSPORT_ERROR.
Dan Winship [Wed, 17 Sep 2003 20:21:28 +0000 (20:21 +0000)]
(soup_session_abort): New, to cancel all pending requests.
Dan Winship [Wed, 17 Sep 2003 20:16:51 +0000 (20:16 +0000)]
Fix two bugs (one that pruned too little, one that pruned too much).
* libsoup/soup-session.c (find_oldest_connection): Fix two bugs
(one that pruned too little, one that pruned too much).
(queue_message): When requeuing, don't run the queue;
final_finished will take care of that later.
* libsoup/soup-socket.c (soup_socket_connect, got_address): ref
the socket while waiting for the address to resolve
Dan Winship [Wed, 17 Sep 2003 18:57:46 +0000 (18:57 +0000)]
Replaces the three previous soup_connection_new* functions and uses
* libsoup/soup-connection.c (soup_connection_new): Replaces the
three previous soup_connection_new* functions and uses gobject
properties to set the destination and proxy uris.
(class_init): set up two more signals, authenticate and
reauthenticate.
(soup_connection_send_request): virtualize
(send_request): Default implementation
* libsoup/soup-connection-ntlm.c: New SoupConnection subclass that
also handles NTLM authentication. Includes all of the NTLM code
formerly in soup-auth-ntlm.c.
* libsoup/soup-auth-ntlm.[ch]: Gone.
* libsoup/soup-auth.c: Remove NTLM refs
* libsoup/soup-session.c (class_init): Add gobject properties for
proxy, max_conns, use_ntlm. Change the "authenticate" and
"reauthenticate" signal prototypes to not pass a SoupAuth (so they
can be used for authenticating SoupConnectionNTLM as well, which
doesn't use a SoupAuth).
(soup_session_new): Renamed from soup_session_new_default.
(soup_session_new_with_options): Replaces
soup_session_new_with_proxy and soup_session_new_full. Takes
gobject properties.
(run_queue): Create a new connection of type SoupConnection or
SoupConnectionNTLM depending on our "use_ntlm" property. Connect
to its authenticate and reauthenticate signals.
(connection_authenticate, connection_reauthenticate): proxy these
signals.
* libsoup/soup-address.c (update_address_from_entry): Fix a
crasher when failing to resolve the address.
* libsoup/soup-dns.c (check_hostent): Fix some "how was this
working before" bugs.
* libsoup/soup-message-client-io.c (soup_message_send_request):
call soup_message_prepare() to clean up the existing response
state.
* libsoup/soup-message-io.c (io_error): Set the read_state to DONE
when processing an OK EOF.
* libsoup/soup-status.h (SoupStatusClass): fix the numbering of
these so that SOUP_STATUS_CLASS_SUCCESS is 2, etc.
* tests/auth-test.c (authenticate, reauthenticate): Update for new
prototypes.
(main): Use soup_session_new.
* tests/get.c (main): Likewise.
* tests/simple-proxy.c (main): Likewise.
Dan Winship [Wed, 10 Sep 2003 21:39:06 +0000 (21:39 +0000)]
Add "authenticate" and "reauthenticate" signals. (invalidate_auth): Remove
* libsoup/soup-session.c: Add "authenticate" and "reauthenticate"
signals.
(invalidate_auth): Remove the call to soup_auth_invalidate.
(authenticate_auth): soup_auth_fn is gone. If the URI doesn't
contain authentication, then emit "authenticate" or
"reauthenticate" (depending on whether or not this is the first
time we've asked for a password for this auth).
(update_auth_internal): If the server rejects our
username/password, don't bail out immediately. Try doing a
"reauthenticate" first.
* libsoup/soup-misc.c (soup_set_authorize_callback): Gone
* libsoup/soup-auth.c (soup_auth_new_from_header_list): Remove the
"pref" arg.
(soup_auth_invalidate): Remove this; it doesn't actually do
anything useful for us.
* libsoup/soup-auth-basic.c (invalidate): Remove
* libsoup/soup-auth-digest.c: (invalidate): Remove
* libsoup/soup-auth-ntlm.c: (invalidate): Remove
* libsoup/soup-uri.c: Remove all references to "authmech".
(soup_uri_set_auth): Remove this too.
* tests/auth-test.c: Update to use the "authenticate" and
"reauthenticate" signals instead of encoding usernames and
passwords in the URIs. Add a few more test cases.
Dan Winship [Wed, 10 Sep 2003 18:14:19 +0000 (18:14 +0000)]
Remove the "status" field from here, since it's mostly used by
* libsoup/soup-message-private.h (SoupMessagePrivate): Remove the
"status" field from here, since it's mostly used by SoupSession,
which shouldn't need access to SoupMessagePrivate.
* libsoup/soup-message.h (SoupMessage): Move it here.
(SoupCallbackFn): Remove this alias for SoupMessageCallbackFn.
(soup_message_set_uri): also moved from soup-message-private.h
* libsoup/soup-message.c: s/msg->priv->status/msg->status/.
* libsoup/soup-message-handlers.c:
s/SoupCallbackFn/SoupMessageCallbackFn/ everywhere.
* libsoup/soup-message-io.c (soup_message_io_client,
soup_message_io_server, soup_message_io_unpause): Don't set up an
idle handler, just jump right in to reading/writing; if this is a
synchronous socket, then the caller wants to block, and if it's
not, then we'll quickly get an EAGAIN anyway.
* libsoup/soup-session.c: (queue_message): Likewise.
(*) Update for SoupMessageStatus move and remove
soup-message-private.h include.
* libsoup/soup-server-message.c: Remove soup-message-private.h
include.
* libsoup/soup-server.c: Likewise.
* libsoup/soup-connection.c (soup_connection_is_connected,
soup_connection_is_new): Remove these, since they weren't being
used.
* libsoup/soup-md5-utils.c: Moved from md5-utils.c and renamed, to
avoid namespace pollution.
* libsoup/soup-auth-digest.c: Update for that.
* libsoup/soup-server-auth.c: Likewise
* tests/auth-test.c: Remove soup-message-private.h include
Dan Winship [Tue, 9 Sep 2003 15:33:48 +0000 (15:33 +0000)]
Beginnings of improved synchronous API support
* libsoup/soup-dns.c: Simplify this by making it not automatically
return the result: force the caller to poll. (This isn't really a
performance issue: the results should come back quickly anyway.)
Also, make the cache thread-safe.
(soup_dns_entry_from_name): Was soup_gethostbyname
(soup_dns_entry_from_addr): Was soup_gethostbyaddr
(soup_dns_entry_check_lookup): Used to poll to see if DNS is done
(soup_dns_entry_get_hostent): Gets the hostent from an entry (and
blocks if it's not resolved yet).
* libsoup/soup-address.c: Update for soup-dns changes.
(soup_address_new): Don't automatically start resolving the
hostname now, since we don't know if the caller is going to want
it resolved synchronously or asynchronously.
(soup_address_resolve_async): Renamed from soup_address_resolve.
(soup_address_resolve_sync): New routine to do blocking
synchronous DNS.
* libsoup/soup-socket.c (soup_socket_connect): Now returns a
status value directly when connecting synchronously.
(soup_socket_client_new_async, soup_socket_client_new_sync):
Separate async/sync client socket functions.
(soup_socket_get_iochannel): Made static since it was not used
outside soup-socket.
* libsoup/soup-connection.c (soup_connection_new,
soup_connection_new_proxy, soup_connection_new_tunnel): Just set
up the data, don't actually start connecting.
(soup_connection_connect_async, soup_connection_connect_sync): New
async and sync SoupConnection connecting routines.
(soup_connection_get_socket): Remove this since it wasn't being
used.
* libsoup/soup-session.c (final_finished): Run the queue since a
connection is now freed up.
(run_queue): Update for soup_connection_new* changes.
* libsoup/soup-misc.c (soup_substring_index): Remove, since it
wasn't being used any more.
* libsoup/soup-private.h: Remove some prototypes for functions
that no longer exist.
* libsoup/soup-uri.c (soup_uri_copy_root): New utility function
(copies the protocol, host, and port of a SoupUri).
* tests/auth-test.c:
* tests/get.c:
* tests/simple-proxy.c: belatedly update for soup-session change
* tests/revserver.c: Handle each new connection in its own thread,
using synchronous SoupSocket calls.
Dan Winship [Fri, 5 Sep 2003 20:02:15 +0000 (20:02 +0000)]
Move a bunch of logic here from soup-context. Now the session keeps track
* libsoup/soup-session.c: Move a bunch of logic here from
soup-context. Now the session keeps track of hosts (instead of
having a global soup_hosts hash) and their connections.
(soup_session_new_with_proxy, soup_session_new_full): New session
constructors to specify a proxy or a proxy and connection limits
(send_request): Add Authorization and Proxy-Authorization headers
before sending off the request.
(soup_session_queue_message, et al): Improve the way this works.
There's no need to use timeouts to wait for connections to become
free; we *know* when they become free.
* libsoup/soup-private.h: Remove SoupHost and some other
no-longer-used stuff.
* libsoup/soup-misc.c (soup_set_proxy, soup_get_proxy,
soup_set_connection_limit, soup_set_connection_limit): Gone. These
are all per-session now.
* libsoup/soup-message.c: Remove all SoupContext references
(mostly replaced with SoupUri references)
(cleanup_message): priv->connect_tag and priv->connection are gone
now, so this was just soup_message_io_cancel(). So remove
cleanup_message and replace it with that everywhere.
(soup_message_disconnect): Gone.
(soup_message_set_uri): Replaces soup_message_set_context.
(soup_message_set_connection, soup_message_get_connection): Gone
* libsoup/soup-message-server-io.c (parse_request_headers):
s/soup_message_set_context/soup_message_set_uri/
* libsoup/soup-message-private.h (SoupMessagePrivate): Remove
connect_tag, context, and connection.
* libsoup/soup-message-client-io.c (encode_http_auth): Gone.
* libsoup/soup-context.c: Gone
* tests/auth-test.c (identify_auth): update for session/context
changes
Dan Winship [Wed, 3 Sep 2003 14:00:24 +0000 (14:00 +0000)]
Renamed from soup-error.h, with types and defines renamed accordingly.
* libsoup/soup-status.h: Renamed from soup-error.h, with types
and defines renamed accordingly.
* libsoup/soup-message.h (SoupMessage): Rename errorcode to
status_code and errorphrase to reason_phrase. Remove errorclass.
(SOUP_MESSAGE_IS_ERROR): Remove this. You can't classify redirects
as being either "errors" or "not errors", so its semantics are
guaranteed to be wrong sometimes.
* libsoup/soup-message.c (soup_message_set_status,
soup_message_set_status_full): Renamed
* libsoup/soup-message-handlers.c
(soup_message_add_status_code_handler,
soup_message_add_status_class_handler): Rename.
* libsoup/soup-session.c (soup_session_send_message): Make this
return a status code rather than a status class.
* libsoup/soup-message-private.h (SoupMessagePrivate): Remove some
unrelated unused fields (retries, callback, user_data).
* ...: Updates
Dan Winship [Tue, 2 Sep 2003 16:15:19 +0000 (16:15 +0000)]
First draft at the new object to maintain formerly-global state. (Not yet
* libsoup/soup-session.c: First draft at the new object to
maintain formerly-global state. (Not yet complete; still need to
get rid of SoupContext).
* libsoup/soup-message-queue.c: Data structure used by SoupSession
* libsoup/soup-queue.c: Gone. Mostly moved into soup-session, but
some bits went into soup-connection.
* libsoup/soup-connection.c (soup_connection_send_request): New,
to send a request on a connection. The connection updates its
internal state and then hands off to soup_message_send_request.
(request_done): Callback set up by soup_connection_send_request.
Marks the connection as no-longer-in-use, and disconnects it if
the message says to.
(soup_connection_set_in_use, soup_connection_mark_old): No longer
needed; the connection takes care of this itself now.
(soup_connection_new_proxy): New, to create a new connection that
is explicitly marked as being through an HTTP proxy.
(soup_connection_new_tunnel): New, to create a new HTTPS
connection through a proxy. (Includes the code to send the
CONNECT.)
* libsoup/soup-context.c (try_existing_connections): Don't need to
call soup_connection_set_in_use.
(try_create_connection): Use soup_connection_new,
soup_connection_new_proxy, or soup_connection_new_tunnel as
appropriate.
* libsoup/soup-message.c (soup_message_prepare): Replaces
queue_message.
(soup_message_queue, soup_message_requeue, soup_message_prepare):
Gone. This must be done via a SoupSession now.
(soup_message_set_connection): don't need to mark in_use/not
in_use. Also, msg->priv->socket is gone now.
(soup_message_get_socket): Gone.
* libsoup/soup-message-handlers.c (soup_message_run_handlers):
Remove references to global handlers.
(redirect_handler, authorize_handler): Moved to soup-session.c.
* libsoup/soup-misc.c (soup_shutdown): Gone; just unref the
session to shut down now.
* libsoup/soup.h: add soup-session.h
* libsoup/Makefile.am: updates
* tests/auth-test.c, tests/get.c, tests/simple-proxy.c: Use
SoupSession.
Dan Winship [Fri, 29 Aug 2003 22:24:54 +0000 (22:24 +0000)]
Major rewrite. There is now only a single IO state object (instead of one
* libsoup/soup-message-io.c: Major rewrite. There is now only a
single IO state object (instead of one for reading and one for
writing), and the IO code handles switching back and forth between
reading and writing as appropriate (including handling the extra
switches needed for "Expect: 100-continue").
(soup_message_io_client, soup_message_io_server): The new entry
points.
(soup_message_io_cancel): If the caller cancels the IO when we
were expecting to read more data, disconnect the socket.
* libsoup/soup-message.h (SoupMessageFlags): add
SOUP_MESSAGE_EXPECT_CONTINUE, to indicate that the IO code should
do the special expect-continue handling.
* libsoup/soup-message.c: Move all the signal stuff here. Remove
the "done_reading" and "done_writing" signals and replace them
with a single "finished" signal. (A single signal. Say that 10
times fast!)
(soup_message_got_headers, etc): Functions to emit signals.
(got_headers, got_chunk, got_body): Default signal methods that
call soup_message_run_handlers.
(finished): Default signal method that replaces
soup_message_issue_callback.
([various]): s/soup_message_issue_callback/soup_message_finished/
(soup_message_requeue): There's no soup_message_set_read_callbacks
any more, so if the caller requeues while it's still reading, just
cancel the read.
(soup_message_add_chunk, soup_message_add_final_chunk,
soup_message_pop_chunk): Moved here from soup-server-message,
although we don't actually quite support using chunked encoding
for requests yet.
* libsoup/soup-server-message.c (soup_server_message_new): No
longer takes a socket argument.
(soup_server_message_add_chunk, soup_server_message_get_chunk):
Moved into SoupMessage.
* libsoup/soup-message-handlers.c (global_handlers): Make these
POST_BODY rather than PRE_BODY, so they won't mess up the IO
channel when the requeue the message.
(soup_message_run_handlers): Don't need to issue the message
callback from here any more.
(authorize_handler): Just leave the error as 401 or 407 (see
soup-error.h change)
* libsoup/soup-message-client-io.c (soup_message_send_request):
Replaces soup_message_write_request and
soup_message_read_response.
* libsoup/soup-message-server-io.c: Parallel to
soup-message-client-io.c, this defines the server-side header
handling.
(soup_message_read_request): Its entry point.
* libsoup/soup-server.c: Lots of code moved into
soup-message-server-io.c. Update for other changes.
* libsoup/soup-queue.c: Update for changes
* libsoup/soup-socket.c (read_from_network, soup_socket_write):
Don't call soup_socket_disconnect() on an error, just return
SOUP_SOCKET_ERROR. Otherwise soup_socket_disconnect() could emit
signals that will mess up the caller of the read/write function.
* libsoup/soup-connection.c (soup_connection_disconnect): When
disconnecting the socket, disconnect from its signals first to
prevent bad reentrancy.
* libsoup/soup-error.h: Kill off SOUP_ERROR_CANT_AUTHENTICATE and
SOUP_ERROR_CANT_AUTHENTICATE_PROXY, since they don't really say
anything that SOUP_ERROR_UNATHORIZED and
SOUP_ERROR_PROXY_UNAUTHORIZED don't say. (And now, all of the
"transport" errors actually are transport-related.)
* tests/auth-test.c (main): s/CANT_AUTHENTICATE/UNAUTHORIZED/
* tests/simple-proxy.c: Complicate this a bunch. In particular,
use SOUP_MESSAGE_OVERWRITE_CHUNKS and the GOT_CHUNK signal, and
pass the data back to the client in chunked format.
Dan Winship [Wed, 27 Aug 2003 13:13:30 +0000 (13:13 +0000)]
New header with typedefs, to avoid #include loops among other headers.
* libsoup/soup-types.h: New header with typedefs, to avoid
#include loops among other headers.
* libsoup/Makefile.am (libsoupinclude_HEADERS): add it
* libsoup/*.[ch], tests/*.c: Update for soup-types.h
Dan Winship [Tue, 26 Aug 2003 20:09:59 +0000 (20:09 +0000)]
Higher-than-soup-message-io-level functions to do client-side IO. (Code
* libsoup/soup-message-client-io.c (soup_message_write_request,
soup_message_read_response): Higher-than-soup-message-io-level
functions to do client-side IO. (Code that used to be in
soup-queue.c)
(get_request_header_cb): Fix a bug in the generation of the Host:
header; need to include the port number if it's not the default.
* libsoup/soup-message-io.c (soup_message_write,
soup_message_write_simple): Take separate user_datas for the get_*
callbacks and the done callbacks.
* libsoup/soup-queue.c: Update to use soup_message_write_request
and soup_message_read_response.
* libsoup/soup-connection.c (soup_connection_new): Change the
prototype to take a SoupUri and a callback.
* libsoup/soup-context.c (try_create_connection,
soup_context_connect_cb): Update for soup_connection_new change.
* libsoup/soup-server.c (read_done_cb, issue_bad_request): Update
for soup_message_write changes
* libsoup/soup-uri.c (soup_uri_uses_default_port): new utility
function
Dan Winship [Tue, 26 Aug 2003 15:34:16 +0000 (15:34 +0000)]
Define SoupMessage signal stuff (READ_HEADERS, READ_CHUNK, READ_BODY,
* libsoup/soup-message-private.h: Define SoupMessage signal stuff
(READ_HEADERS, READ_CHUNK, READ_BODY, READ_ERROR, WROTE_HEADERS,
WROTE_CHUNK, WROTE_BODY, WRITE_ERROR).
* libsoup/soup-message.c (class_init): set up signals
(requeue_read_finished): Update for changes.
* libsoup/soup-message-io.c (soup_message_read): Split out
parse_headers_cb from read_headers_cb. Also add a SoupDataBuffer *
arg to say where to store the message body. Set up
read_headers_cb, read_chunk_cb, read_body_cb, and error_cb as
signal handlers.
(do_read): Call r->parse_headers_cb, then emit READ_HEADERS
(read_body_chunk): emit READ_CHUNK.
(issue_final_callback): Set r->body. emit READ_BODY.
(failed_read): emit READ_ERROR.
(soup_message_read_set_callbacks): Disconnect old signal handlers,
connect new ones.
(soup_message_read_cancel): Disconnect signal handlers.
(soup_message_write, soup_message_write_simple): Set up
wrote_body_cb and error_cb as signal handlers.
(do_write): emit WROTE_HEADERS and WROTE_CHUNK, even though
nothing currently ever listens for them. emit WROTE_BODY when
done.
(failed_write): emit WRITE_ERROR
* libsoup/soup-queue.c (soup_queue_parse_headers_cb,
soup_queue_read_headers_cb): Split this into two unequal chunks.
(read_header_cb only runs the pre-body handlers).
(soup_queue_read_chunk_cb, soup_queue_read_done_cb): Update
prototypes.
(soup_queue_write_done_cb): Update call to soup_message_read
* libsoup/soup-server.c (parse_headers_cb): Renamed from
read_headers_cb
(read_done_cb): Update prototype
(start_request): Update soup_message_read call.
Dan Winship [Mon, 25 Aug 2003 17:59:33 +0000 (17:59 +0000)]
Add a "user_data" arg, pass it to the callbacks.
* libsoup/soup-message-io.c (soup_message_read,
soup_message_write, soup_message_write_simple): Add a "user_data"
arg, pass it to the callbacks.
* libsoup/soup-message.c (soup_message_requeue,
requeue_read_finished, requeue_read_error): Update for that
* libsoup/soup-queue.c: Likewise
* libsoup/soup-server.c: Likewise
Dan Winship [Mon, 25 Aug 2003 14:07:55 +0000 (14:07 +0000)]
fix a doc comment
Dan Winship [Mon, 25 Aug 2003 14:06:02 +0000 (14:06 +0000)]
Take a uri string instead of a context. Also, swap the args (so the method
* libsoup/soup-message.c (soup_message_new): Take a uri string
instead of a context. Also, swap the args (so the method comes
before the URI, just like in the protocol).
(soup_message_new_from_uri): Like soup_messgae_new, but takes a
SoupUri instead of a string
(soup_message_set_request, soup_message_set_response): Replace
soup_message_new_full.
(cleanup_message): Was soup_message_cleanup, but is static now.
(queue_message): Do the pre-queuing message cleanup here instead
of in soup_queue_message.
(soup_message_queue): Set the callback and user_data, then call
queue_message.
(requeue_read_error, requeue_read_finished, soup_message_requeue):
Use queue_message
(soup_message_get_uri): Replaces soup_message_get_context.
* libsoup/soup-message.h (SoupMessage): Remove msg->context. (It's
part of SoupMessagePrivate now)
* libsoup/soup-context.c: #include soup-message-private
(soup_context_from_uri): constify the uri arg.
* libsoup/soup-queue.c: Various context/uri fixes
(proxy_https_connect): Use soup_message_new_from_uri.
(soup_queue_message): Drastically simplified since most of the
work is in soup-messsage.c:queue_message() now
* libsoup/soup-auth-digest.c (compute_response,
get_authorization): Use soup_message_get_uri.
* libsoup/soup-server-auth.c (parse_digest): Likewise
* libsoup/soup-server.c (call_handler): Likewise
* tests/simple-httpd.c (server_callback): Likewise.
* tests/simple-proxy.c (server_callback): Likewise
* tests/get.c (got_url): Likewise.
(get_url): Update soup_message_new usage.
* tests/auth-test.c: #include soup-message-private. Update for
context changes and soup_message_new change.
Dan Winship [Fri, 22 Aug 2003 18:49:02 +0000 (18:49 +0000)]
New file containing SoupMessagePrivate and some other
* libsoup/soup-message-private.h: New file containing
SoupMessagePrivate and some other soup-message-internal
types/functions. Also includes the new, expanded SoupMessageStatus
enum.
* libsoup/soup-message-io.c: Replaces what used to be in
soup-transfer, but now all the interfaces take SoupMessages
instead of SoupReader/SoupWriter and deal with maintaining
msg->priv->{read,write}_state themselves. Fixes up all the
refcounting madness.
* libsoup/soup-message-handlers.c: Move the handler code here,
mostly unchanged. (But rename SoupHandlerType to SoupHandlerPhase
to make the distinction from SoupHandlerKind clearer.)
* libsoup/soup-message.c: Update for soup-message-io and new
SoupMessageStatus values. Remove handler code.
(soup_message_cleanup): Remove the hack to try to preserve the
connection if the message gets cleaned up before it finishes
reading. soup_message_requeue handles this in the requeuing case,
and there's no especially compelling reason to bother doing it in
any other case. (And the soup-message-io api doesn't support
having a read operation that's not connected to any message.)
* libsoup/soup-private.h: remove SoupMessagePrivate
* libsoup/soup-queue.c: Update for soup-message-io and new
SoupMessageStatus values.
* libsoup/soup-server-message.c: Likewise
* libsoup/soup-server.c: Likewise
* libsoup/soup-transfer.c: Gone (yay)
* libsoup/Makefile.am (libsoup_2_2_la_SOURCES): update
Dan Winship [Fri, 22 Aug 2003 16:36:47 +0000 (16:36 +0000)]
belated fix to make this compile again
Dan Winship [Wed, 20 Aug 2003 17:49:59 +0000 (17:49 +0000)]
Make this a GObject. (Note that since SoupMessage was not refcounted
* libsoup/soup-message.c: Make this a GObject. (Note that since
SoupMessage was not refcounted before, it's not really refcounted
now either. TBF)
(soup_message_free): Gone, replaced by g_object_unref
(soup_message_copy, soup_message_foreach_remove_header): Remove
these, since neither was currently functional.
(soup_message_is_keepalive): New utility function to look at
HTTP version and request/response headers to decide if a message
indicates the connection should be kept alive.
(soup_message_set_connection, soup_message_get_connection): New
(soup_message_get_socket): New
* libsoup/soup-server-message.c: Make this a subclass of
SoupMessage.
(soup_server_message_new): Now takes a SoupServer and SoupSocket
(soup_server_message_get_server): New
(soup_server_message_set_encoding,
soup_server_message_get_encoding): Get/set whether the message
should be sent with content-length or chunked encoding
(soup_server_message_is_started, soup_server_message_is_finished):
Private member accessors.
(soup_server_message_add_chunk): Renamed from add_data
(soup_server_message_get_chunk): Pops a chunk from the list.
(soup_server_message_get_source): Gone
* libsoup/soup-server.c: Update for SoupServerMessage changes.
(error_cb, write_done_cb): All the cleanup stuff that used to be
here happens automatically by unreffing the message now.
(get_response_header): Remove some erroneous leftover CGI stuff
(issue_bad_request): add "Connection: close" to the response.
(read_headers_cb): clean this up a bit. Reject HTTP/1.1 messages
with no Host header as per RFC 2616.
* libsoup/soup-connection.c (soup_connection_start_ssl): Gone
(soup_connection_set_in_use): Let the caller set the connection to
"not in use" even after the socket has been disconnected.
* libsoup/soup-context.c: Use soup_message_get_connection
* libsoup/soup-headers.c (soup_headers_parse_request): Remove the
check on request length, since it was rejecting
"GET / HTTP/1.0\r\n\r\n", which is a valid complete request.
* libsoup/soup-queue.c: Use soup_message_get_connection and
soup_message_get_socket.
(soup_queue_read_done_cb): Use soup_message_is_keepalive
(proxy_https_connect_cb): Use soup_socket_start_ssl rather than
soup_connection_start_ssl
* libsoup/soup-socket.c (finalize): disconnect the GIOChannel
handlers if the socket hasn't been disconnected yet.
* libsoup/soup-transfer.c (soup_reader_read_body_chunk,
reader_read): Fix these so that reader_read will exit properly if
the read is cancelled.
* tests/auth-test.c (main): s/soup_message_free/g_object_unref/
* tests/simple-httpd.c (server_callback): set the message to
content-length encoding.
* tests/simple-proxy.c (server_callback): Likewise
Dan Winship [Tue, 19 Aug 2003 19:04:09 +0000 (19:04 +0000)]
New API for doing socket IO. Works both synchronously and asynchronously,
* libsoup/soup-socket.c (soup_socket_read,
soup_socket_read_until, soup_socket_write): New API for doing
socket IO. Works both synchronously and asynchronously, and
buffers data to prevent the "100 Continue" problem.
(soup_socket_set_flag): Replaces formerly-private
soup_set_sockopts. (primarily to let the caller turn off
SOUP_SOCKET_FLAG_NONBLOCKING).
* libsoup/soup-transfer.c (soup_transfer_read,
soup_transfer_write, soup_transfer_write_simple): Take a
SoupSocket instead of a GIOChannel. Use the new socket IO api.
Changed the prototypes of some of the callbacks to be less
hackish.
* libsoup/soup-connection.c (soup_connection_get_socket): Replaces
soup_connection_get_iochannel.
* libsoup/soup-message.c: Fix up for soup-transfer changes
* libsoup/soup-queue.c: Likewise
* libsoup/soup-server.c: Likewise
* tests/revserver.c: A slightly more complicated replacement for
timeserver. (Does both reads and writes)
Dan Winship [Tue, 19 Aug 2003 17:35:57 +0000 (17:35 +0000)]
Remove this. RC doesn't let you configure it, and no one has complained,
* libsoup/soup-socks.[ch]: Remove this. RC doesn't let you
configure it, and no one has complained, and it looks like the
SOCKS5 auth code doesn't actually work anyway...
* libsoup/soup-queue.c (proxy_connect): Remove SOCKS code.
* libsoup/soup-uri.h: Remove SOUP_PROTOCOL_SOCKS4 and
SOUP_PROTOCOL_SOCKS5
* libsoup/soup-misc.c: Remove a references to SOCKS in a comment
* libsoup/Makefile.am (libsoup_2_2_la_SOURCES): remove
soup-socks.[ch]
Dan Winship [Tue, 19 Aug 2003 14:47:15 +0000 (14:47 +0000)]
Make this a GObject. Remove SoupServerMessage code (to
* libsoup/soup-server.c: Make this a GObject. Remove
SoupServerMessage code (to soup-server-message.c). Remove CGI
server code (for now?)
(soup_server_add_handler, soup_server_remove_handler): Rename
(from register/unregister) to make it clearer what they do.
* libsoup/soup-server-message.c: Moved out of soup-server.c
* libsoup/soup-private.h: Remove SoupServer def
* libsoup/Makefile.am (libsoupinclude_HEADERS,
libsoup_2_2_la_SOURCES): add soup-server-message.[ch]
* tests/simple-httpd.c:
* tests/simple-proxy.c: Update for SoupServer changes
Dan Winship [Mon, 18 Aug 2003 15:59:05 +0000 (15:59 +0000)]
Make this more like a struct sockaddr again (like it used to be). In
* libsoup/soup-address.c (SoupAddressPrivate): Make this more like
a struct sockaddr again (like it used to be). In particular, add
back the "port" field. Add a bunch of macros to try (and fail) to
simplify some of the code.
(soup_address_new): Now returns a SoupAddress directly rather than
a random handle, and the caller can just use g_object_unref to
cancel the lookup. Also, the callback now uses a
SoupKnownErrorCode rather than a special-purpose address-lookup
error code.
(soup_address_new_cancel): No longer needed.
(soup_address_new_sync): Removed
(soup_address_new_any): Replaces soup_address_ipv4_any and
soup_address_ipv6_any.
(soup_address_get_name, etc): Gone. Use soup_address_resolve()
now.
(soup_address_get_physical): Renamed from
soup_address_get_canonical_name.
(soup_address_get_sockaddr): Replaces soup_address_make_sockaddr()
* libsoup/soup-socket.c: Update for SoupAddress changes and make
similar changes here.
(soup_socket_new): Just creates a generic SoupSocket now.
(soup_socket_connect): Client setup
(soup_socket_listen): Server setup. Now also sets up an iochannel
listening for connects and emits a "new_connection" signal as they
come in.
(soup_socket_start_ssl): Turns on SSL.
(soup_socket_client_new, soup_socket_server_new): Utility
functions that wrap the above.
(soup_socket_new_cancel, soup_socket_new_sync): Gone
(soup_socket_server_accept, soup_socket_server_try_accept): No
longer needed.
(soup_socket_get_iochannel): No longer adds a ref when returning
the iochannel. Also, we set it to "close_on_unref" so that if a
caller adds a ref to it, the connection will actually remain open
even after the SoupSocket is destroyed.
(soup_socket_get_local_address, soup_socket_get_remote_address):
Let the caller get both of these.
* libsoup/soup-connection.c: Don't keep a private copy of the
socket's iochannel.
(soup_connection_new): Don't need to set socket options here.
SoupSocket does it.
(soup_connection_start_ssl): Just call soup_socket_start_ssl.
(soup_connection_get_iochannel): Just return the socket's
iochannel (and don't ref it)
* libsoup/soup-error.c: add SOUP_ERROR_CANT_RESOLVE and
SOUP_ERROR_CANT_RESOLVE_PROXY
* libsoup/soup-dns.c (soup_ntop): Make the address arg const.
Remove the "FIXME add a CANT_RESOLVE error" and return
SOUP_ERROR_CANT_RESOLVE instead.
* libsoup/soup-server.c: Update for socket/address changes. Don't
poke into SoupSocket's private fields.
(soup_server_run_async): Just connect to the socket's
"new_connection" signal.
* libsoup/soup-context.c (try_create_connection,
soup_context_connect_cb): Update for socket changes. Replace
SOUP_CONNECT_ERROR codes with plain SOUP_ERROR codes.
* libsoup/soup-misc.c (soup_signal_connect_once): Utility function
to connect to a signal handler and connect another function to
clean up the first signal handler after its first invocation.
(Lets us use signals to replace one-off callbacks.)
* libsoup/soup-private.h: Remove SoupSocketPrivate since it is
actually private now.
(struct _SoupServer): Remove accept_tag.
* libsoup/soup-queue.c (soup_queue_read_done_cb, start_request):
Don't unref the iochannel.
(soup_queue_connect_cb): Takes a SoupKnownErrorCode now.
* libsoup/soup-socks.c: Update for socket/address changes
* tests/simple-httpd.c (main):
s/SOUP_SERVER_ANY_PORT/SOUP_ADDRESS_ANY_PORT/
* tests/simple-proxy.c (main): Likewise
* tests/timeserver.c: Update for SoupSocket's "new_connection"
signal, and for SoupAddress changes.
Dan Winship [Thu, 14 Aug 2003 15:02:32 +0000 (15:02 +0000)]
New, split out from soup-context and made into a GObject.
* libsoup/soup-connection.c: New, split out from soup-context and
made into a GObject.
(soup_connection_disconnect): Disconnects the connection and emits
a signal. (Replaces the old "keep_alive" flag.)
(soup_connection_is_connected): Checks if the connection is still
connected
(connection_died): Just disconnect, rather than freeing the
connection. This way if anyone else is still referencing it they
won't end up with an invalid pointer.
* libsoup/soup-context.c: Make this a GObject, remove all the
SoupConnection code. Add an "ntlm_auths" field to SoupHost so that
SoupContext can keep track of connection auth stuff there without
SoupConnection needing to care. Various other updates.
* libsoup/soup-private.h: Remove SoupContext and SoupConnection
definitions.
* libsoup/*.c, tests/get.c: Update for context/connection changes
* libsoup/soup-socks.c (soup_connect_socks_proxy): Change the
definition to deal with the fact that there's no
soup_connection_get_context any more.
* libsoup/soup-queue.c (soup_queue_read_headers_cb): Don't deal
with connection persistence here.
(soup_queue_read_done_cb): Do it here instead. Disconnect the
connection when appropriate.
(proxy_connect, proxy_https_connect, proxy_https_connect_cb):
Reference-count the connection properly. (I think.)
* libsoup/soup-marshal.list: New, for SoupConnection's
"disconnected" signal.
* libsoup/Makefile.am: add rules to build soup-marshal.[ch]
* configure.in: Use AM_PATH_GLIB_2 rather than pkg-config, so that
GLIB_GENMARSHAL gets set too.
Antonio Xu [Thu, 14 Aug 2003 14:24:27 +0000 (14:24 +0000)]
Add signal.h to solve the problem of building on Solaris 8
2003-08-14 Antonio Xu <antonio.xu@sun.com>
Add signal.h to solve the problem of building on Solaris 8
Dan Winship [Thu, 14 Aug 2003 14:01:35 +0000 (14:01 +0000)]
Fix a spelling mistake.
* libsoup/soup-error.c: Fix a spelling mistake.
* libsoup/*.c: Fix use of @/%/#/() in gtk-doc comments
Dan Winship [Tue, 12 Aug 2003 18:00:14 +0000 (18:00 +0000)]
Make this an abstract GObject. Tweak some of the interfaces around a
* libsoup/soup-auth.c: Make this an abstract GObject. Tweak some
of the interfaces around a little bit.
* libsoup/soup-auth-basic.c: subclass for Basic auth
* libsoup/soup-auth-digest.c: subclass for Digest auth
* libsoup/soup-auth-ntlm.c: subclass for NTLM auth. Move all of
the code from soup-ntlm.c here, and make it private.
* libsoup/soup-ntlm.c: gone
* libsoup/soup-misc.h: Remove the definition of SoupAuthType from
here, and change the signature of SoupAuthorizeFn.
* libsoup/soup-context.c: Use g_object_unref to free auths, use
methods instead of directly access private fields.
* libsoup/soup-queue.c: Likewise
* libsoup/soup-server-auth.c (soup_server_auth_free): Remove all
NTLM references. We have no plans to implement server-side NTLM
auth.
* tests/auth-test.c (identify_auth): Update for auth api changes
Dan Winship [Tue, 12 Aug 2003 17:13:53 +0000 (17:13 +0000)]
add gobject-2.0 to the PKG_CHECK_MODULES call
* configure.in (GLIB): add gobject-2.0 to the PKG_CHECK_MODULES
call
* libsoup/soup-address.c: Make this a GObject.
(soup_address_ref, soup_address_unref): Gone.
(soup_address_copy): Gone. Wasn't being used anyway.
* libsoup/soup-dns.c: Move all of the DNS code and caching stuff
here from soup-address.c, so that soup-address doesn't need to
worry about trying to cache zero-ref addresses.
* libsoup/soup-socket.c: Make this a GObject. Use "guint"
consistently for port numbers.
(soup_socket_ref, soup_socket_unref): Gone.
* libsoup/soup-private.h: Change the SoupSocket definition to be
SoupSocketPrivate. (Still need to keep this here since soup-server
pokes around in its internals.)
(SOUP_MAKE_TYPE): Copied from gal's E_MAKE_TYPE.
* libsoup/soup-server.c (read_done_cb, write_done_cb): Unref the
reader/writer rather than leaking them.
* libsoup/*: Use GObject methods for socket/address refcounting
* tests/auth-test.c (main)
* tests/timeserver.c (main): Call g_type_init.
* tests/get.c (main): Call g_type_init.
(get_url, got_url): Fix some bugs that could make -r mode get into
infinite loops downloading the same files over and over. Plug some
memory leaks to make this more useful for valgrinding libsoup.
* tests/simple-httpd.c (main): Call g_type_init. Set up a signal
handler for SIGINT so we can exit cleanly, since valgrind won't
give a leak report if you don't. Plug a few memory leaks.
* tests/simple-proxy.c (main): Likewise
Dan Winship [Tue, 12 Aug 2003 16:00:31 +0000 (16:00 +0000)]
Pull over some new test programs from the soup-refactoring branch,
along with the SoupUri changes they depend on.
* tests/simple-httpd.c: A really simple HTTP server, to test the
server code.
* tests/simple-proxy.c: An even simpler HTTP proxy
* tests/get.c: Add "-r" flag to recursively get files (thereby
testing multiple-connections-at-once code). Also good for setting
up a tree to use with simple-httpd.
* tests/timeserver.c (main): Fix a bug. (s/ipv6/ipv4/ in the
normal case)
* tests/uri-parsing.c: Regression test for the new soup-uri.c
* libsoup/soup-uri.c: Rewrite/update to conform to RFC 2396, and
pull in some optimizations from camel-url. Also, make SoupProtocol
a GQuark so we can still compare them with ==, but we can also
recognize any protocol.
(soup_uri_new_with_base): New, to merge base and relative URIs
(soup_uri_to_string): Update this. Change the "show_password" flag
(which we always passed FALSE for) to "just_path", for places that
want the path+query without the protocol, host, etc.
* libsoup/soup-queue.c (soup_get_request_header): Just use
soup_uri_to_string to generate the request URI.
* libsoup/soup-auth.c (compute_response, digest_auth_func): Use
"soup_uri_to_path (uri, TRUE)" rather than trying to reassemble
the URI by hand badly.
* libsoup/soup-server-auth.c (parse_digest): Likewise
* libsoup/soup-socks.c (soup_connect_socks_proxy): Change a
switch() to an series of if()s since SOUP_PROTOCOL_* aren't
constants any more.
* libsoup/soup-context.c (soup_context_uri_hash,
soup_context_uri_equal): s/querystring/query/
Dan Winship [Tue, 12 Aug 2003 14:12:25 +0000 (14:12 +0000)]
Update for pc file rename
* Makefile.am: Update for pc file rename
Dan Winship [Tue, 12 Aug 2003 14:08:26 +0000 (14:08 +0000)]
Bump API version to 2.2 and package version to 2.1.0. Remove NSS and
* configure.in: Bump API version to 2.2 and package version to
2.1.0. Remove NSS and OpenSSL checks and proxy-related config. Use
libgnutls-config to find GNUTLS.
* libsoup-2.2.pc.in: Update, and rename from soup-2.0.pc
* libsoup/Makefile.am: s/2.0/2.2/ everywhere. Remove NSS, OpenSSL,
and libsoup-ssl-proxy stuff.
* libsoup/soup-ssl-proxy.c
* libsoup/soup-nss.[ch]
* libsoup/soup-openssl.[ch]: gone
* libsoup/soup-ssl.c: remove NSS and OpenSSL bits
* tests/Makefile.am (get_LDADD, timeserver_LDADD,
auth_test_LDADD): Update libsoup version
Dan Winship [Mon, 11 Aug 2003 13:50:51 +0000 (13:50 +0000)]
These are all really SoupContext functions, so move them to soup-context.c
* libsoup/soup-auth.c (soup_auth_lookup, soup_auth_set_context,
soup_auth_invalidate): These are all really SoupContext functions,
so move them to soup-context.c (and rename them appropriately).
(soup_auth_get_protection_space): New method to get the
"protection space" of an auth (paths where it is valid).
(soup_auth_invalidate): New method to try to un-authenticate an
auth (so we can keep the domain info cached even if the auth info
is wrong).
(basic_pspace_func): Basic protection space is all directories
below the current one.
(basic_invalidate_func): Clear the encoded username/password
(digest_pspace_func): Digest protection space is either the whole
server, or "what the domain parameter says" (though we don't deal
with cross-host domains).
(digest_invalidate_func): Return FALSE; bad digest auth info isn't
cacheable.
(digest_parse_func, digest_free): Set/free domain parameter
(ntlm_pspace): NTLM protection space is always the whole server.
(ntlm_invalidate): Clear the auth state.
(soup_auth_new_ntlm): Make this non-static
(SoupAuth): Replace the quad-state "status" field with an
"authenticated" boolean.
* libsoup/soup-private.h (SoupHost): Replace the "valid_auths"
hash with separate "auth_realms" (path->realm) and "auths"
(realm->auth) hashes. Also add a "use_ntlm" flag.
* libsoup/soup-context.c (soup_context_unref): Update SoupHost
freeing code.
(connection_free): Don't the connection's auth, just free it.
(soup_context_lookup_auth): Formerly soup_auth_lookup, but now
does two-stage lookup (path->realm then realm->auth) and also
deals with NTLM hacks.
(soup_context_update_auth): Mostly formerly soup_auth_set_context,
but also large parts of authorize_handler. Updates the auth hashes
based on information from a 401 or 407 response. Does a better job
than authorize_handler did of not throwing away good information.
(soup_context_preauthenticate): New; fakes up auth info so that
requests will end up using authentication without the server
needing to return an error first.
(soup_context_authenticate_auth): Moved out of authorize_handler
so it can be used at request-sending time too, if we know that we
need it. (That way we can avoid requeuing the request if it isn't
going to be able to be authenticated.)
(soup_context_invalidate_auth): Sort of like the old
soup_auth_invalidate, but only destroys the auth data, while still
remembering the path->realm mapping.
* libsoup/soup-message.c (authorize_handler): Mostly moved into
soup_context_update_auth.
(maybe_validate_auth): Remove this; it was only useful because of
bugs elsewhere in the auth handling.
* libsoup/soup-queue.c (soup_encode_http_auth): Update for
soup_context_lookup_auth. If the returned auth isn't
authenticated, call soup_context_authenticate_auth() on it.
* tests/auth-test.c: New (from soup-refactoring branch). Tests
that the Basic/Digest auth code does the right thing. (TODO: find
a good way to add NTLM tests too.)
* tests/Makefile.am (check_PROGRAMS): add auth-test
Dan Winship [Tue, 29 Jul 2003 15:04:01 +0000 (15:04 +0000)]
1.99.25 ("Potato and Leek Soup")
* configure.in: 1.99.25 ("Potato and Leek Soup")
* libsoup/soup-message.c (requeue_read_finished,
release_connection): Free the passed-in body data. Otherwise the
response body ends up getting leaked on most 3xx and 4xx
responses.
(soup_message_cleanup): Remove a piece of code that didn't
actually do anything and its associated confused comment.
* libsoup/soup-auth.c (ntlm_free): plug an occasional NTLM auth leak
* libsoup/soup-context.c (connection_free): plug a non-occasional
NTLM auth leak.
Joe Shaw [Thu, 26 Jun 2003 16:26:42 +0000 (16:26 +0000)]
Version 1.99.24
2003-06-26 Joe Shaw <joe@ximian.com>
* configure.in: Version 1.99.24
Dan Winship [Tue, 24 Jun 2003 16:02:41 +0000 (16:02 +0000)]
Check pkgconfig for openssl, since 0.9.7 (a) uses it, and (b) depends on
* configure.in: Check pkgconfig for openssl, since 0.9.7 (a) uses
it, and (b) depends on lots of new things sometimes (like on RH9).
* libsoup/soup-openssl.c:
* libsoup/soup-ssl-proxy.c: Change #ifdef HAVE_OPENSSL_SSL_H to
just #ifdef HAVE_OPENSSL since the header check doesn't get run in
the pkgconfig case
Dan Winship [Mon, 23 Jun 2003 15:52:34 +0000 (15:52 +0000)]
unref the old read_tag before changing/clearing it.
* libsoup/soup-queue.c (soup_queue_read_done_cb): unref the
old read_tag before changing/clearing it.
(soup_queue_write_done_cb): Likewise with the write_tag.
* libsoup/soup-transfer.c (issue_final_callback): ref the reader
around the stop+callback.
(soup_transfer_write_cb): Likewise.
Dan Winship [Tue, 17 Jun 2003 12:24:12 +0000 (12:24 +0000)]
add a ref_count field. (soup_transfer_read, create_writer): Set initial
* libsoup/soup-transfer.c (SoupReader, SoupWriter): add a
ref_count field.
(soup_transfer_read, create_writer): Set initial ref_count to 2
(one for soup-transfer, one for the caller).
(soup_transfer_read_ref, soup_transfer_read_unref): ref/unref a
reader
(soup_transfer_read_stop): Clears the GIOChannel callbacks and
drops soup-transfer's ref.
(soup_transfer_read_cancel): Now just a stop+unref
(soup_transfer_write_ref, soup_transfer_write_unref,
soup_transfer_write_stop, soup_transfer_write_cancel): Similarly.
* libsoup/soup-message.c (soup_message_cleanup): when setting up
the "finish reading" callbacks, unref the reader so it will be
destroyed once it's done reading.
(soup_message_requeue): Likewise.
* libsoup/soup-queue.c (soup_queue_read_headers_cb): Update for
prototype change (no longer returns a SoupTransferDone).
(soup_queue_read_chunk_cb): Likewise.
* libsoup/soup-server.c (read_headers_cb): Likewise
Dan Winship [Wed, 11 Jun 2003 18:11:31 +0000 (18:11 +0000)]
Change all functions to take a SoupReader * or SoupWriter * instead of a
* libsoup/soup-transfer.c: Change all functions to take a
SoupReader * or SoupWriter * instead of a guint.
* libsoup/soup-private.h (SoupMessagePrivate): make read_tag and
write_tag pointers instead of guints.
Chris Toshok [Mon, 2 Jun 2003 20:47:19 +0000 (20:47 +0000)]
remove #include for soup-nss.h
2003-06-02 Chris Toshok <toshok@ximian.com>
* libsoup/soup-ssl.c: remove #include for soup-nss.h
Chris Toshok [Mon, 2 Jun 2003 20:42:59 +0000 (20:42 +0000)]
remove NSS_CFLAGS. (libsoup_2_0_la_LIBADD): remove NSS_LIBS.
2003-06-02 Chris Toshok <toshok@ximian.com>
* libsoup/Makefile.am (INCLUDES): remove NSS_CFLAGS.
(libsoup_2_0_la_LIBADD): remove NSS_LIBS.
(libsoup_2_0_la_SOURCES): remove soup-nss.[ch]
Chris Toshok [Mon, 2 Jun 2003 20:18:55 +0000 (20:18 +0000)]
Bump version to 1.99.23.
2003-06-02 Chris Toshok <toshok@ximian.com>
* configure.in: Bump version to 1.99.23.
Chris Toshok [Mon, 2 Jun 2003 20:17:29 +0000 (20:17 +0000)]
always force a reconnect when there's an error with ssl connection. This
2003-05-30 Chris Toshok <toshok@ximian.com>
* libsoup/soup-queue.c (soup_queue_error_cb): always force a
reconnect when there's an error with ssl connection. This fixes
#43387, but it runs the risk of sending requests multiple times to
the exchange server, and it results in lots of shorter lived
connections and more forking (in the ssl proxy case), depending on
the length of the operation.
Dan Winship [Wed, 21 May 2003 12:23:11 +0000 (12:23 +0000)]
1.99.22 (codename: French Onion Soup)
* configure.in: 1.99.22 (codename: French Onion Soup)
Dan Winship [Wed, 21 May 2003 05:01:51 +0000 (05:01 +0000)]
Clear the write_tag as well so we don't double-cancel it. #43395.
* libsoup/soup-message.c (soup_message_requeue): Clear the
write_tag as well so we don't double-cancel it. #43395.
* libsoup/soup-queue.c (soup_queue_error_cb): The connection might
be destroyed by the end of the func, so we have to call
soup_connection_set_used at the beginning.
* libsoup/soup-openssl.c (soup_openssl_read, soup_openssl_write):
Call g_set_error() so that we don't SEGV immediately after
returning G_IO_STATUS_ERROR.
Dan Winship [Thu, 15 May 2003 13:27:07 +0000 (13:27 +0000)]
file soup-proxy-connection.c was initially added on branch soup-refactoring.
Dan Winship [Thu, 15 May 2003 13:27:07 +0000 (13:27 +0000)]
file soup-proxy-connection.h was initially added on branch soup-refactoring.
Joe Shaw [Fri, 9 May 2003 16:34:44 +0000 (16:34 +0000)]
Bump version to 1.99.21
2003-05-08 Joe Shaw <joe@ximian.com>
* configure.in: Bump version to 1.99.21
* libsoup/soup-queue.c (proxy_connect): If the proxy HTTPS
tunnelling fails, the other message which shares our same
connection will free it first, so set ours to NULL.
Dan Winship [Fri, 9 May 2003 15:25:33 +0000 (15:25 +0000)]
If the auth status is PENDING, return an NTLM request string. Otherwise
* libsoup/soup-auth.c (ntlm_auth): If the auth status is PENDING,
return an NTLM request string. Otherwise return the "response"
field (which should include the NTLM authenticate message)
(ntlm_init): Don't bother setting "response" to the NTLM request
string. Just leave it NULL in that case.
* libsoup/soup-message.c (authorize_handler): Never try to reuse
an NTLM auth returned from soup_auth_lookup. Only set the auth on
the connection when it's SOUP_AUTH_STATUS_SUCCESSFUL. Otherwise,
call soup_auth_set_context() on it just like for non-NTLM auth.
The net effect of all of this is that now we record when a context
needs NTLM auth just like with non-NTLM auth, so that that info
gets preserved across connections.
(soup_message_requeue): No longer need the hackery here to
preserve the connection auth state.
* libsoup/soup-context.c (soup_connection_set_in_use): New, to
toggle the connection's in_use flag, and set up the death watch
when it's not in use.
(connection_death): This is only hooked up when the connection is
not in use now, so don't need to check that. Should fix the
infinite connection_death loop.
(soup_connection_is_new): Keep a distinct "new" flag rather than
defining "new" as "has been released at least once".
(soup_connection_set_used): Mark a connection no-longer new.
(soup_context_connect_cb): Mark the connection as new. Don't set
up the death watch since it's in_use.
(try_existing_connections): Use soup_connection_set_in_use.
(soup_connection_release): Likewise
* libsoup/soup-message.c (requeue_read_finished): Call
soup_connection_set_used so that the connection isn't still
considered new when we send the message the second time.
* libsoup/soup-queue.c (soup_queue_error_cb): Call
soup_connection_set_used (assuming we don't close the connection)
(soup_queue_read_done_cb): Likewise.
* libsoup/soup-transfer.c (soup_transfer_read_cb): If we read
nothing, call soup_transfer_read_error_cb rather than just
cancelling, or else it will get cancelled again later.
Dan Winship [Wed, 7 May 2003 17:49:33 +0000 (17:49 +0000)]
Don't put @OPENSSL_LIBS@ here; the library doesn't depend on them, only
* soup-2.0.pc.in (Libs): Don't put @OPENSSL_LIBS@ here; the
library doesn't depend on them, only the proxy does. #42473
Dan Winship [Tue, 6 May 2003 13:00:52 +0000 (13:00 +0000)]
Change the redirect handler to be a RESPONSE_ERROR_CLASS_HANDLER for
* src/libsoup/soup-message.c (global_handlers): Change the
redirect handler to be a RESPONSE_ERROR_CLASS_HANDLER for
SOUP_ERROR_CLASS_REDIRECT rather than a RESPONSE_HEADER_HANDLER
for "Location" to get around the non-64-bit-clean union
initialization pointed out by Jeremy Katz <katzj@redhat.com>.
(redirect_handler): Update for that.
Dan Winship [Tue, 29 Apr 2003 16:02:24 +0000 (16:02 +0000)]
1.99.20
* configure.in: 1.99.20
* libsoup/soup-transfer.c (soup_transfer_read_error_cb): Make sure
we always call UNIGNORE_CANCEL. Might fix #41971
projects / platform / upstream / libsoup.git / log