diff options
| author | Ross Lagerwall <rosslagerwall@gmail.com> | 2014-07-17 17:41:37 +0100 |
|---|---|---|
| committer | Ross Lagerwall <rosslagerwall@gmail.com> | 2014-07-17 17:41:37 +0100 |
| commit | 198873c067452adad337155be84d17c616d22ed5 (patch) | |
| tree | d5367cb75114f02857b7460a947facf63292ec57 /daemon/gvfsbackenddav.c | |
| parent | 85953661f8932f6a72dcbef729140ea6e7f8f153 (diff) | |
| download | gvfs-198873c067452adad337155be84d17c616d22ed5.tar.gz | |
Revert "http: Remove use of SoupSessionSync/SoupSessionAsync"
This reverts commit 4b76a7e10d76b26929425dc8a392bf0cee246b98.
Reverting for now since this has concurrency with libsoup:
https://bugzilla.gnome.org/show_bug.cgi?id=732783
https://bugzilla.gnome.org/show_bug.cgi?id=732925
Diffstat (limited to 'daemon/gvfsbackenddav.c')
| -rw-r--r-- | daemon/gvfsbackenddav.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/daemon/gvfsbackenddav.c b/daemon/gvfsbackenddav.c index d88e4fc8..42a966a9 100644 --- a/daemon/gvfsbackenddav.c +++ b/daemon/gvfsbackenddav.c @@ -1939,6 +1939,11 @@ do_mount (GVfsBackend *backend, g_object_unref (msg_opts); g_object_unref (msg_stat); + /* also auth the async session */ + g_signal_connect (G_VFS_BACKEND_HTTP (backend)->session_async, "authenticate", + G_CALLBACK (soup_authenticate_from_data), + data); + g_vfs_job_succeeded (G_VFS_JOB (job)); g_debug ("- mount\n"); } @@ -2551,7 +2556,7 @@ try_close_write (GVfsBackend *backend, soup_message_set_request (msg, "application/octet-stream", SOUP_MEMORY_TAKE, data, length); - soup_session_queue_message (G_VFS_BACKEND_HTTP (backend)->session, + soup_session_queue_message (G_VFS_BACKEND_HTTP (backend)->session_async, msg, try_close_write_sent, job); return TRUE; @@ -2899,7 +2904,7 @@ push_read_cb (GObject *source, GAsyncResult *res, gpointer user_data) soup_message_body_append_take (handle->msg->request_body, handle->buf, n); handle->buf = NULL; handle->n_read += n; - soup_session_unpause_message (G_VFS_BACKEND_HTTP (handle->backend)->session, + soup_session_unpause_message (G_VFS_BACKEND_HTTP (handle->backend)->session_async, handle->msg); } else if (n == 0) @@ -2914,7 +2919,7 @@ push_read_cb (GObject *source, GAsyncResult *res, gpointer user_data) G_IO_ERROR_FAILED, _("File length changed during transfer")); - soup_session_cancel_message (G_VFS_BACKEND_HTTP (handle->backend)->session, + soup_session_cancel_message (G_VFS_BACKEND_HTTP (handle->backend)->session_async, handle->msg, SOUP_STATUS_CANCELLED); } @@ -2925,7 +2930,7 @@ push_read_cb (GObject *source, GAsyncResult *res, gpointer user_data) handle->buf = NULL; g_vfs_job_failed_from_error (handle->job, error); g_error_free (error); - soup_session_cancel_message (G_VFS_BACKEND_HTTP (handle->backend)->session, + soup_session_cancel_message (G_VFS_BACKEND_HTTP (handle->backend)->session_async, handle->msg, SOUP_STATUS_CANCELLED); } @@ -2958,7 +2963,7 @@ push_write_next_chunk (SoupMessage *msg, gpointer user_data) { g_vfs_job_failed_from_error (handle->job, error); g_error_free (error); - soup_session_cancel_message (G_VFS_BACKEND_HTTP (handle->backend)->session, + soup_session_cancel_message (G_VFS_BACKEND_HTTP (handle->backend)->session_async, handle->msg, SOUP_STATUS_CANCELLED); return; @@ -3067,7 +3072,7 @@ push_stat_dest_cb (SoupSession *session, SoupMessage *msg, gpointer user_data) g_signal_connect (handle->msg, "wrote-body-data", G_CALLBACK (push_wrote_body_data), handle); - soup_session_queue_message (G_VFS_BACKEND_HTTP (handle->backend)->session, + soup_session_queue_message (G_VFS_BACKEND_HTTP (handle->backend)->session_async, handle->msg, push_done, handle); } |