summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Graveley <alex@ximian.com>2002-01-19 12:44:54 +0000
committerAlex Graveley <orph@src.gnome.org>2002-01-19 12:44:54 +0000
commit9933e79146d592efc71b07a8cdf06a8a90f6ffbf (patch)
treeeb57608a7291dc4e41bf97b5e607f04980228567
parent7b20f59baf236adf3f38c0e748c464e2f90f0f88 (diff)
downloadlibsoup-9933e79146d592efc71b07a8cdf06a8a90f6ffbf.tar.gz
Don't unref the context returned from connection_get_context, as soup-0.5
2002-01-19 Alex Graveley <alex@ximian.com> * src/libsoup/soup-socks.c (soup_socks_write): Don't unref the context returned from connection_get_context, as soup-0.5 doesn't add a ref. (soup_connect_socks_proxy): Ditto.
-rw-r--r--ChangeLog7
-rw-r--r--libsoup/soup-socks.c16
2 files changed, 21 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6c71c7fe..373d0040 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-01-19 Alex Graveley <alex@ximian.com>
+
+ * src/libsoup/soup-socks.c (soup_socks_write): Don't unref the
+ context returned from connection_get_context, as soup-0.5 doesn't
+ add a ref.
+ (soup_connect_socks_proxy): Ditto.
+
2002-01-18 Joe Shaw <joe@ximian.com>
* configure.in, src/libsoup/soup-private.h: Version 0.5.6.
diff --git a/libsoup/soup-socks.c b/libsoup/soup-socks.c
index 623be186..8eb0518d 100644
--- a/libsoup/soup-socks.c
+++ b/libsoup/soup-socks.c
@@ -89,9 +89,18 @@ soup_socks_write (GIOChannel* iochannel,
proxy_ctx = soup_connection_get_context (sd->src_conn);
proxy_uri = soup_context_get_uri (proxy_ctx);
- soup_context_unref (proxy_ctx);
+ /*
+ * BUGFIX: Soup-0.5 doesn't ref the returned context, so don't unref it.
+ */
+ /* soup_context_unref (proxy_ctx); */
switch (sd->phase) {
+#if 0
+ case SOCKS_4_DEST_ADDR_LOOKUP:
+ if (!sd->dest_addr)
+ return TRUE;
+ /* fall-through */
+#endif
case SOCKS_4_SEND_DEST_ADDR:
buf[len++] = 0x04;
buf[len++] = 0x01;
@@ -293,7 +302,10 @@ soup_connect_socks_proxy (SoupConnection *conn,
proxy_ctx = soup_connection_get_context (conn);
proxy_uri = soup_context_get_uri (proxy_ctx);
- soup_context_unref (proxy_ctx);
+ /*
+ * BUGFIX: Soup-0.5 doesn't ref the returned context, so don't unref it.
+ */
+ /* soup_context_unref (proxy_ctx); */
sd = g_new0 (SoupSocksData, 1);
sd->src_conn = conn;