+2002-11-18 Dan Winship <danw@ximian.com>
+
+ * libsoup/soup-address.c (soup_address_hash): Don't use s6_addr32
+ since it's apparently non-portable. Use s6_addr instead.
+ (soup_gethostbyaddr): fix a sometimes-uninitialized variable.
+
+ * libsoup/soup-message.c (soup_message_get_request_header, etc):
+ Remove long-deprecated API.
+
+ * libsoup/soup-socket.c (soup_socket_connect): remove unused
+ variable.
+
+ * libsoup/soup-openssl.c (soup_openssl_read): Use gsize.
+ * libsoup/soup-server.c (cgi_read): Likewise
+ * libsoup/soup-socks.c (soup_socks_write, soup_socks_read):
+ Likewise.
+ * libsoup/soup-ssl-proxy.c (soup_ssl_proxy_readwrite): Likewise.
+ * libsoup/soup-transfer.c (soup_transfer_read_cb,
+ soup_transfer_write_cb): Likewise.
+
+ * tests/timeserver.c: Add "-6" to listen on the IPv6 local address
+ instead of IPv4. (Tested on OS X.)
+
2002-11-15 Dan Winship <danw@ximian.com>
* libsoup/*: Change old Helix Code refs to Ximian (and update
return ia->addr.in.s_addr;
#ifdef HAVE_IPV6
case AF_INET6:
- return (ia->addr.in6.s6_addr32[0] ^
- ia->addr.in6.s6_addr32[1] ^
- ia->addr.in6.s6_addr32[2] ^
- ia->addr.in6.s6_addr32[3]);
+ {
+ guint32 *addr = (guint32 *)&(ia->addr.in6.s6_addr);
+ return (addr[0] ^ addr[1] ^ addr[2] ^ addr[3]);
+ }
#endif
default:
return 0;
if (result)
rv = g_strdup (result->h_name);
+ else
+ rv = NULL;
if (buf)
g_free (buf);
#if defined(HAVE_GETHOSTBYNAME_R_GLIB_MUTEX)
}
/**
- * soup_message_set_request_header:
- * @req: a %SoupMessage.
- * @name: header name.
- * @value: header value.
- *
- * ** DEPRECATED **
- *
- * Adds a new transport header to be sent on an outgoing request. Passing a NULL
- * @value will remove all headers with a name equal to @name.
- */
-void
-soup_message_set_request_header (SoupMessage *req,
- const gchar *name,
- const gchar *value)
-{
- g_return_if_fail (req != NULL);
- g_return_if_fail (name != NULL || name [0] != '\0');
-
- g_warning ("soup_message_set_request_header is DEPRECATED. Use "
- "soup_message_add_header, with msg->request_headers as "
- "the first argument.\n");
-
- soup_message_add_header (req->request_headers, name, value);
-}
-
-/**
- * soup_message_get_request_header:
- * @req: a %SoupMessage.
- * @name: header name.
- *
- * ** DEPRECATED **
- *
- * Lookup the first transport request header with a key equal to @name.
- *
- * Return value: the header's value or NULL if not found.
- */
-const gchar *
-soup_message_get_request_header (SoupMessage *req,
- const gchar *name)
-{
- GSList *vals;
- g_return_val_if_fail (req != NULL, NULL);
- g_return_val_if_fail (name != NULL || name [0] != '\0', NULL);
-
- g_warning ("soup_message_get_request_header is DEPRECATED. Use "
- "soup_message_get_header, with msg->request_headers as "
- "the first argument.\n");
-
- if (req->request_headers) {
- vals = g_hash_table_lookup (req->request_headers, name);
- if (vals)
- return vals->data;
- }
-
- return NULL;
-}
-
-/**
- * soup_message_set_response_header:
- * @req: a %SoupMessage.
- * @name: header name.
- * @value: header value.
- *
- * ** DEPRECATED **
- *
- * Adds a new transport header to be sent on an outgoing response. Passing a
- * NULL @value will remove all headers with a name equal to @name.
- */
-void
-soup_message_set_response_header (SoupMessage *req,
- const gchar *name,
- const gchar *value)
-{
- g_return_if_fail (req != NULL);
- g_return_if_fail (name != NULL || name [0] != '\0');
-
- g_warning ("soup_message_set_response_header is DEPRECATED. Use "
- "soup_message_add_header, with msg->response_headers as "
- "the first argument.\n");
-
- soup_message_add_header (req->response_headers, name, value);
-}
-
-/**
- * soup_message_get_response_header:
- * @req: a %SoupMessage.
- * @name: header name.
- *
- * ** DEPRECATED **
- *
- * Lookup the transport response header with a key equal to @name.
- *
- * Return value: the header's value or NULL if not found.
- */
-const gchar *
-soup_message_get_response_header (SoupMessage *req,
- const gchar *name)
-{
- GSList *vals;
- g_return_val_if_fail (req != NULL, NULL);
- g_return_val_if_fail (name != NULL || name [0] != '\0', NULL);
-
- g_warning ("soup_message_get_response_header is DEPRECATED. Use "
- "soup_message_get_header, with msg->response_headers as "
- "the first argument.\n");
-
- if (req->response_headers) {
- vals = g_hash_table_lookup (req->response_headers, name);
- if (vals)
- return vals->data;
- }
-
- return NULL;
-}
-
-/**
* soup_message_queue:
* @req: a %SoupMessage.
* @callback: a %SoupCallbackFn which will be called after the message completes
guint errcode,
const gchar *errphrase);
-/** DEPRECATED API **/
-
-/** DEPRECATED **/
-void soup_message_set_request_header (SoupMessage *req,
- const gchar *name,
- const gchar *value);
-
-/** DEPRECATED **/
-const gchar *soup_message_get_request_header (SoupMessage *req,
- const gchar *name);
-
-/** DEPRECATED **/
-void soup_message_set_response_header (SoupMessage *req,
- const gchar *name,
- const gchar *value);
-
-/** DEPRECATED **/
-const gchar *soup_message_get_response_header (SoupMessage *req,
- const gchar *name);
-
#endif /*SOUP_MESSAGE_H*/
static GIOStatus
soup_openssl_read (GIOChannel *channel,
gchar *buf,
- guint count,
- guint *bytes_read,
+ gsize count,
+ gsize *bytes_read,
GError **err)
{
SoupOpenSSLChannel *chan = (SoupOpenSSLChannel *) channel;
else {
while (reader->recv_buf->len < reader->content_len) {
guchar read_buf [RESPONSE_BLOCK_SIZE];
- gint bytes_read;
+ gsize bytes_read;
GIOError error;
error = g_io_channel_read (serv_chan,
gpointer data)
{
SoupSocketConnectState* state;
- SoupAddress *cached_addr;
g_return_val_if_fail (hostname != NULL, NULL);
g_return_val_if_fail (func != NULL, NULL);
gboolean finished = FALSE;
guchar buf[128];
gint len = 0, sa_len;
- guint bytes_written;
+ gsize bytes_written;
GIOError error;
dest_uri = soup_context_get_uri (sd->dest_ctx);
SoupSocksData *sd)
{
guchar buf[128];
- guint bytes_read;
+ gsize bytes_read;
GIOError error;
error = g_io_channel_read (iochannel, buf, sizeof (buf), &bytes_read);
GIOChannel *dest)
{
gchar read_buf [RESPONSE_BLOCK_SIZE];
- gint bytes_read = 0, bytes_written = 0, write_total = 0;
+ gsize bytes_read = 0, bytes_written = 0, write_total = 0;
GIOError error;
error = g_io_channel_read (iochannel,
SoupReader *r)
{
gchar read_buf [RESPONSE_BLOCK_SIZE];
- gint bytes_read = 0, total_read = 0;
+ gsize bytes_read = 0, total_read = 0;
gboolean read_done = FALSE;
gboolean cancelled = FALSE;
GIOError error;
{
GIOError error;
gpointer pipe_handler;
- guint bytes_written = 0;
+ gsize bytes_written = 0;
/*
* Get the header and first data chunk (if available).
projects / platform / upstream / libsoup.git / commitdiff