--- modules/http-method.c.old	2005-01-10 01:34:30.941967736 +1100
+++ modules/http-method.c	2005-01-10 01:34:26.255680160 +1100
@@ -609,7 +609,7 @@
 
 		/* ANALYZE_HTTP ("==> +get_header read"); */
 		result = gnome_vfs_socket_buffer_read (socket_buffer, &c, 1,
-				&bytes_read);
+				&bytes_read, NULL);
 		/* ANALYZE_HTTP ("==> -get_header read"); */
 
 		if (result != GNOME_VFS_OK) {
@@ -625,7 +625,7 @@
 				char next;
 
 				result = gnome_vfs_socket_buffer_peekc (
-						socket_buffer, &next);
+						socket_buffer, &next, NULL);
 				if (result != GNOME_VFS_OK) {
 					return result;
 				}
@@ -1229,39 +1229,40 @@
 	buffer = g_strdup_printf ("CONNECT %s:%d HTTP/1.0\r\n\r\n",
 			server_host, server_port);
 	result = gnome_vfs_socket_write (http_socket, buffer, strlen(buffer),
-			&bytes);
+			&bytes, NULL);
 	g_free (buffer);
 
 	if (result != GNOME_VFS_OK) {
-		gnome_vfs_socket_close (http_socket);
+		gnome_vfs_socket_close (http_socket, NULL);
 		return result;
 	}
 
 	buffer = proxy_get_authn_header_for_uri (NULL); /* FIXME need uri */
 	if (buffer != NULL) {
 		result = gnome_vfs_socket_write (http_socket, buffer, 
-				strlen(buffer), &bytes);
+				strlen(buffer), &bytes, NULL);
 		g_free (buffer);
 	}
 
 	if (result != GNOME_VFS_OK) {
-		gnome_vfs_socket_close (http_socket);
+		gnome_vfs_socket_close (http_socket, NULL);
 		return result;
 	}
 
 	bytes = 8192;
 	buffer = g_malloc0 (bytes);
 
-	result = gnome_vfs_socket_read (http_socket, buffer, bytes-1, &bytes);
+	result = gnome_vfs_socket_read (http_socket, buffer, bytes-1, &bytes,
+					NULL);
 
 	if (result != GNOME_VFS_OK) {
-		gnome_vfs_socket_close (http_socket);
+		gnome_vfs_socket_close (http_socket, NULL);
 		g_free (buffer);
 		return result;
 	}
 
 	if (!parse_status (buffer, &status_code)) {
-		gnome_vfs_socket_close (http_socket);
+		gnome_vfs_socket_close (http_socket, NULL);
 		g_free (buffer);
 		return GNOME_VFS_ERROR_PROTOCOL_ERROR;
 	}
@@ -1269,7 +1270,7 @@
 	result = http_status_to_vfs_result (status_code);
 
 	if (result != GNOME_VFS_OK) {
-		gnome_vfs_socket_close (http_socket);
+		gnome_vfs_socket_close (http_socket, NULL);
 		g_free (buffer);
 		return result;
 	}
@@ -1279,10 +1280,10 @@
 
 	g_free (buffer);
 
-	result = gnome_vfs_ssl_create_from_fd (&ssl, fd);
+	result = gnome_vfs_ssl_create_from_fd (&ssl, fd, NULL);
 
 	if (result != GNOME_VFS_OK) {
-		gnome_vfs_socket_close (http_socket);
+		gnome_vfs_socket_close (http_socket, NULL);
 		return result;
 	}
 
@@ -1378,7 +1379,8 @@
 
 		if (https) {
 			result = gnome_vfs_ssl_create (&ssl, 
-					toplevel_uri->host_name, host_port);
+					toplevel_uri->host_name, host_port,
+					NULL);
 
 			if (result != GNOME_VFS_OK) {
 				return result;
@@ -1400,7 +1402,7 @@
 	*p_socket_buffer = gnome_vfs_socket_buffer_new (socket);
 
 	if (*p_socket_buffer == NULL) {
-		gnome_vfs_socket_close (socket);
+		gnome_vfs_socket_close (socket, NULL);
 		return GNOME_VFS_ERROR_INTERNAL;
 	}
 
@@ -1481,7 +1483,7 @@
 
 	/* Transmit the request headers.  */
 	result = gnome_vfs_socket_buffer_write (socket_buffer, request->str, 
-			request->len, &bytes_written);
+			request->len, &bytes_written, NULL);
 
 	if (result != GNOME_VFS_OK) {
 		goto error;
@@ -1492,14 +1494,15 @@
 		ANALYZE_HTTP ("==> Writing data");
 		
 		result = gnome_vfs_socket_buffer_write (socket_buffer, 
-				data->data, data->len, &bytes_written);
+				data->data, data->len, &bytes_written,
+				NULL);
 	}
 
 	if (result != GNOME_VFS_OK) {
 		goto error;
 	}
 
-	result = gnome_vfs_socket_buffer_flush (socket_buffer);	
+	result = gnome_vfs_socket_buffer_flush (socket_buffer, NULL);	
 
 error:
 	return result;
@@ -1635,7 +1638,7 @@
 	}
 	
 	if (socket_buffer != NULL) {
-		gnome_vfs_socket_buffer_destroy (socket_buffer, TRUE);
+		gnome_vfs_socket_buffer_destroy (socket_buffer, TRUE, NULL);
 	}
 	
 	ANALYZE_HTTP ("==> -make_request");
@@ -1650,9 +1653,10 @@
 	
 	if (handle != NULL) {
 		if (handle->socket_buffer) {
-			gnome_vfs_socket_buffer_flush (handle->socket_buffer);
+			gnome_vfs_socket_buffer_flush (handle->socket_buffer,
+							NULL);
 			gnome_vfs_socket_buffer_destroy (handle->socket_buffer,
-							 TRUE);
+							 TRUE, NULL);
 			handle->socket_buffer = NULL;
 		}
 
@@ -1913,7 +1917,7 @@
 
 		while ((bytes=MIN(sizeof(drop_buffer), handle->offset - handle->socket_buffer_offset))) {
 			result = gnome_vfs_socket_buffer_read (handle->socket_buffer, drop_buffer, 
-					bytes, &bytes_read);
+					bytes, &bytes_read, NULL);
 			if (result != GNOME_VFS_OK)
 				return result;
 			handle->socket_buffer_offset += bytes_read;
@@ -1942,8 +1946,9 @@
 		handle->socket_buffer_offset = handle->offset;
 	}
 
-	result = gnome_vfs_socket_buffer_read (handle->socket_buffer, buffer, 
-			num_bytes, bytes_read);
+	result = 
+	gnome_vfs_socket_buffer_read (handle->socket_buffer, buffer, 
+			num_bytes, bytes_read, NULL);
 	
 	if (*bytes_read == 0) {
 		return GNOME_VFS_ERROR_EOF;