WebKit Bugzilla
Attachment 357256 Details for
Bug 192678
: [GTK] Error writing data to TLS socket in some sites when using the jhbuild
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-192678-20181213163111.patch (text/plain), 22.52 KB, created by
Michael Catanzaro
on 2018-12-13 14:31:12 PST
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Michael Catanzaro
Created:
2018-12-13 14:31:12 PST
Size:
22.52 KB
patch
obsolete
>Subversion Revision: 239177 >diff --git a/Tools/ChangeLog b/Tools/ChangeLog >index 43b1b3099d17a311042ffea1bfa0bd7c2584dc73..bb40b2bbf967bdb6985133835c37e89785be7553 100644 >--- a/Tools/ChangeLog >+++ b/Tools/ChangeLog >@@ -1,3 +1,21 @@ >+2018-12-13 Michael Catanzaro <mcatanzaro@igalia.com> >+ >+ [GTK] Error writing data to TLS socket in some sites when using the jhbuild >+ https://bugs.webkit.org/show_bug.cgi?id=192678 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Update our ancient versions of libsoup and glib-networking. >+ >+ * gtk/jhbuild.modules: >+ * gtk/patches/libsecret-secret-methods-Don-t-unref-NULL-when-search-fails.patch: Removed. >+ * gtk/patches/libsoup-auth-Fix-async-authentication-when-flag-SOUP_MESSAGE.patch: Removed. >+ * gtk/patches/libsoup-auth-do-not-use-cached-credentials-in-lookup-method-.patch: Removed. >+ * gtk/patches/libsoup-soup-message-io-Do-not-fail-when-there-s-no-empty-li.patch: Removed. >+ * gtk/patches/libsoup-soup-socket-fix-critical-warning-when-the-peer-certi.patch: Removed. >+ * wpe/jhbuild.modules: >+ * wpe/patches/libsoup-soup-socket-fix-critical-warning-when-the-peer-certi.patch: Removed. >+ > 2018-12-13 Ross Kirsling <ross.kirsling@sony.com> > > Unreviewed -- update my status to "reviewer". >diff --git a/Tools/gtk/jhbuild.modules b/Tools/gtk/jhbuild.modules >index d6a5a81085995e2c5e89a30121be0b28d3c7c0eb..fa1f2e3f2d2fee1cb0bcf1a833e3e0ba9bfc69bc 100644 >--- a/Tools/gtk/jhbuild.modules >+++ b/Tools/gtk/jhbuild.modules >@@ -222,19 +222,14 @@ > </branch> > </meson> > >- <autotools id="glib-networking" >- autogen-sh="configure"> >- <if condition-set="macos"> >- <autogenargs value="--with-ca-certificates='/usr/local/etc/openssl/cert.pem' --without-pkcs11"/> >- </if> >+ <meson id="glib-networking"> > <dependencies> > <dep package="glib"/> > </dependencies> >- <branch module="/pub/GNOME/sources/glib-networking/2.50/glib-networking-2.50.0.tar.xz" version="2.50.0" >+ <branch module="/pub/GNOME/sources/glib-networking/2.58/glib-networking-${version}.tar.xz" version="2.58.0" > repo="ftp.gnome.org" >- hash="sha256:3f1a442f3c2a734946983532ce59ed49120319fdb10c938447c373d5e5286bee" >- md5sum="4d06d0224646f274918b1cb6da9a07f6"/> >- </autotools> >+ hash="sha256:bdfa0255e031b8ee003cc283002536b77ee76450105f1dc6ab066b9bf4330068"/> >+ </meson> > > <autotools id="libsoup" > autogen-sh="configure" >@@ -245,13 +240,9 @@ > <dependencies> > <dep package="glib-networking"/> > </dependencies> >- <branch module="/pub/GNOME/sources/libsoup/2.57/libsoup-2.57.1.tar.xz" version="2.57.1" >+ <branch module="/pub/GNOME/sources/libsoup/2.64/libsoup-${version}.tar.xz" version="2.64.2" > repo="ftp.gnome.org" >- hash="sha256:ca1ca037e89e8bc7b782559f3ec5d89c9d0b836f505b2f95e008ed517fd6658f"> >- <patch file="libsoup-auth-Fix-async-authentication-when-flag-SOUP_MESSAGE.patch" strip="1"/> >- <patch file="libsoup-auth-do-not-use-cached-credentials-in-lookup-method-.patch" strip="1"/> >- <patch file="libsoup-soup-message-io-Do-not-fail-when-there-s-no-empty-li.patch" strip="1"/> >- <patch file="libsoup-soup-socket-fix-critical-warning-when-the-peer-certi.patch" strip="1"/> >+ hash="sha256:75ddc194a5b1d6f25033bb9d355f04bfe5c03e0e1c71ed0774104457b3a786c6"> > </branch> > </autotools> > >diff --git a/Tools/gtk/patches/libsecret-secret-methods-Don-t-unref-NULL-when-search-fails.patch b/Tools/gtk/patches/libsecret-secret-methods-Don-t-unref-NULL-when-search-fails.patch >deleted file mode 100644 >index c225bb75a52d8c2ecee2d0ef14a62193bfc647ff..0000000000000000000000000000000000000000 >--- a/Tools/gtk/patches/libsecret-secret-methods-Don-t-unref-NULL-when-search-fails.patch >+++ /dev/null >@@ -1,30 +0,0 @@ >-From f76e333d09bc43a30037490a63d16fb79ccb3149 Mon Sep 17 00:00:00 2001 >-From: Michael Catanzaro <mcatanzaro@igalia.com> >-Date: Wed, 6 Sep 2017 20:46:14 -0500 >-Subject: [PATCH] secret-methods: Don't unref NULL when search fails >- >-If the gnome-keyring D-Bus service is not responding, we wind up freeing >-the SearchClosure in an error path without ever creating a SecretService >-object. Guard against this. >- >-https://bugzilla.gnome.org/show_bug.cgi?id=787391 >---- >- libsecret/secret-methods.c | 2 +- >- 1 file changed, 1 insertion(+), 1 deletion(-) >- >-diff --git a/libsecret/secret-methods.c b/libsecret/secret-methods.c >-index 48eb716..c0cbc99 100644 >---- a/libsecret/secret-methods.c >-+++ b/libsecret/secret-methods.c >-@@ -51,7 +51,7 @@ static void >- search_closure_free (gpointer data) >- { >- SearchClosure *closure = data; >-- g_object_unref (closure->service); >-+ g_clear_object (&closure->service); >- g_clear_object (&closure->cancellable); >- g_hash_table_unref (closure->items); >- g_variant_unref (closure->attributes); >--- >-2.11.0 >- >diff --git a/Tools/gtk/patches/libsoup-auth-Fix-async-authentication-when-flag-SOUP_MESSAGE.patch b/Tools/gtk/patches/libsoup-auth-Fix-async-authentication-when-flag-SOUP_MESSAGE.patch >deleted file mode 100644 >index 67545df3883ec5bb097eb65b06d1789d942e13c2..0000000000000000000000000000000000000000 >--- a/Tools/gtk/patches/libsoup-auth-Fix-async-authentication-when-flag-SOUP_MESSAGE.patch >+++ /dev/null >@@ -1,130 +0,0 @@ >-From afee3002ff45b7a00df3d6804fa7d329b907d361 Mon Sep 17 00:00:00 2001 >-From: Carlos Garcia Campos <cgarcia@igalia.com> >-Date: Mon, 30 Jan 2017 13:57:12 +0100 >-Subject: [PATCH 1/2] auth: Fix async authentication when flag >- SOUP_MESSAGE_DO_NOT_USE_AUTH_CACHE is used >- >-When the flag SOUP_MESSAGE_DO_NOT_USE_AUTH_CACHE is used, it's not possible >-to successfully authenticate, and SOUP_STATUS_UNAUTHORIZED is always >-returned even when soup_auth_autenticate was called with the right >-credentials. This happens because we set the auth on the soup message right >-after emitting the authenticate signal only if it was authenticated. If the >-signal pauses the message, the auth will no longer be associated to the message, >-and not cached either because flag SOUP_MESSAGE_DO_NOT_USE_AUTH_CACHE is >-present. Since we always check if the auth returned by >-soup_auth_get_message is ready before trying to use it, we can simply >-always set the auth on the mssage right after emitting the authenticate >-signal even if it was not authenticated yet. If it's eventually >-authenticated then got-body callback will check it's ready to re-queue >-the message as expected. >- >-https://bugzilla.gnome.org/show_bug.cgi?id=777936 >---- >- libsoup/soup-auth-manager.c | 4 +-- >- tests/auth-test.c | 61 +++++++++++++++++++++++++++++++++++++++++++++ >- 2 files changed, 63 insertions(+), 2 deletions(-) >- >-diff --git a/libsoup/soup-auth-manager.c b/libsoup/soup-auth-manager.c >-index 704661bc..9ff446cc 100644 >---- a/libsoup/soup-auth-manager.c >-+++ b/libsoup/soup-auth-manager.c >-@@ -625,7 +625,7 @@ auth_got_headers (SoupMessage *msg, gpointer manager) >- /* If we need to authenticate, try to do it. */ >- authenticate_auth (manager, auth, msg, >- prior_auth_failed, FALSE, TRUE); >-- soup_message_set_auth (msg, soup_auth_is_ready (auth, msg) ? auth : NULL); >-+ soup_message_set_auth (msg, auth); >- g_object_unref (auth); >- g_mutex_unlock (&priv->lock); >- } >-@@ -689,7 +689,7 @@ proxy_auth_got_headers (SoupMessage *msg, gpointer manager) >- /* If we need to authenticate, try to do it. */ >- authenticate_auth (manager, auth, msg, >- prior_auth_failed, TRUE, TRUE); >-- soup_message_set_proxy_auth (msg, soup_auth_is_ready (auth, msg) ? auth : NULL); >-+ soup_message_set_proxy_auth (msg, auth); >- g_object_unref (auth); >- g_mutex_unlock (&priv->lock); >- } >-diff --git a/tests/auth-test.c b/tests/auth-test.c >-index b674c61c..23e22133 100644 >---- a/tests/auth-test.c >-+++ b/tests/auth-test.c >-@@ -1336,6 +1336,66 @@ do_message_do_not_use_auth_cache_test (void) >- } >- >- static void >-+async_no_auth_cache_authenticate (SoupSession *session, SoupMessage *msg, >-+ SoupAuth *auth, gboolean retrying, SoupAuth **auth_out) >-+{ >-+ debug_printf (1, " async_no_auth_cache_authenticate\n"); >-+ >-+ soup_session_pause_message (session, msg); >-+ *auth_out = g_object_ref (auth); >-+ g_main_loop_quit (loop); >-+} >-+ >-+static void >-+async_no_auth_cache_finished (SoupSession *session, SoupMessage *msg, gpointer user_data) >-+{ >-+ debug_printf (1, " async_no_auth_cache_finished\n"); >-+ >-+ g_main_loop_quit (loop); >-+} >-+ >-+static void >-+do_async_message_do_not_use_auth_cache_test (void) >-+{ >-+ SoupSession *session; >-+ SoupMessage *msg; >-+ char *uri; >-+ SoupAuth *auth = NULL; >-+ SoupMessageFlags flags; >-+ >-+ SOUP_TEST_SKIP_IF_NO_APACHE; >-+ >-+ loop = g_main_loop_new (NULL, TRUE); >-+ session = soup_test_session_new (SOUP_TYPE_SESSION_ASYNC, NULL); >-+ uri = g_strconcat (base_uri, "Basic/realm1/", NULL); >-+ >-+ msg = soup_message_new ("GET", uri); >-+ g_free (uri); >-+ g_signal_connect (session, "authenticate", >-+ G_CALLBACK (async_no_auth_cache_authenticate), &auth); >-+ flags = soup_message_get_flags (msg); >-+ soup_message_set_flags (msg, flags | SOUP_MESSAGE_DO_NOT_USE_AUTH_CACHE); >-+ g_object_ref (msg); >-+ soup_session_queue_message (session, msg, async_no_auth_cache_finished, NULL); >-+ g_main_loop_run (loop); >-+ >-+ soup_test_assert_message_status (msg, SOUP_STATUS_UNAUTHORIZED); >-+ >-+ soup_test_assert (auth, "msg didn't get authenticate signal"); >-+ soup_auth_authenticate (auth, "user1", "realm1"); >-+ g_object_unref (auth); >-+ >-+ soup_session_unpause_message (session, msg); >-+ g_main_loop_run (loop); >-+ >-+ soup_test_assert_message_status (msg, SOUP_STATUS_OK); >-+ >-+ soup_test_session_abort_unref (session); >-+ g_object_unref (msg); >-+ g_main_loop_unref (loop); >-+} >-+ >-+static void >- has_authorization_header_authenticate (SoupSession *session, SoupMessage *msg, >- SoupAuth *auth, gboolean retrying, gpointer data) >- { >-@@ -1432,6 +1492,7 @@ main (int argc, char **argv) >- g_test_add_func ("/auth/disappearing-auth", do_disappearing_auth_test); >- g_test_add_func ("/auth/clear-credentials", do_clear_credentials_test); >- g_test_add_func ("/auth/message-do-not-use-auth-cache", do_message_do_not_use_auth_cache_test); >-+ g_test_add_func ("/auth/async-message-do-not-use-auth-cache", do_async_message_do_not_use_auth_cache_test); >- g_test_add_func ("/auth/authorization-header-request", do_message_has_authorization_header_test); >- >- ret = g_test_run (); >--- >-2.11.0 >- >diff --git a/Tools/gtk/patches/libsoup-auth-do-not-use-cached-credentials-in-lookup-method-.patch b/Tools/gtk/patches/libsoup-auth-do-not-use-cached-credentials-in-lookup-method-.patch >deleted file mode 100644 >index 7d3ab58b2cd6f1ceee4a0e078f7330c9ad5af63a..0000000000000000000000000000000000000000 >--- a/Tools/gtk/patches/libsoup-auth-do-not-use-cached-credentials-in-lookup-method-.patch >+++ /dev/null >@@ -1,114 +0,0 @@ >-From c8401c372adc9a9cb11fc870c390affb10379cfa Mon Sep 17 00:00:00 2001 >-From: Carlos Garcia Campos <cgarcia@igalia.com> >-Date: Sat, 11 Feb 2017 17:44:46 +0100 >-Subject: [PATCH 2/2] auth: do not use cached credentials in lookup method when >- flag SOUP_MESSAGE_DO_NOT_USE_AUTH_CACHE is present >- >-This is causing that a request with flag >-SOUP_MESSAGE_DO_NOT_USE_AUTH_CACHE success if a previous request without >-the flag stored the credentials. This patch also fixes another issues >-with the test /auth/message-do-not-use-auth-cache, the case of providing >-the credentials in the url was working because do_digest_nonce_test() >-didn't disconnect the authenticate signal that was actually used. This >-is because soup_uri_to_string removes the password from the uri. The >-test needs to use a custom message created with >-soup_message_new_from_uri() instead of using do_digest_nonce_test(). >- >-https://bugzilla.gnome.org/show_bug.cgi?id=778497 >---- >- libsoup/soup-auth-manager.c | 6 ++++++ >- tests/auth-test.c | 29 +++++++++++++++++++++++++---- >- 2 files changed, 31 insertions(+), 4 deletions(-) >- >-diff --git a/libsoup/soup-auth-manager.c b/libsoup/soup-auth-manager.c >-index 9ff446cc..b32ba900 100644 >---- a/libsoup/soup-auth-manager.c >-+++ b/libsoup/soup-auth-manager.c >-@@ -472,6 +472,9 @@ lookup_auth (SoupAuthManagerPrivate *priv, SoupMessage *msg) >- if (auth && soup_auth_is_ready (auth, msg)) >- return auth; >- >-+ if (soup_message_get_flags (msg) & SOUP_MESSAGE_DO_NOT_USE_AUTH_CACHE) >-+ return NULL; >-+ >- host = get_auth_host_for_uri (priv, soup_message_get_uri (msg)); >- if (!host->auth_realms && !make_auto_ntlm_auth (priv, host)) >- return NULL; >-@@ -496,6 +499,9 @@ lookup_proxy_auth (SoupAuthManagerPrivate *priv, SoupMessage *msg) >- if (auth && soup_auth_is_ready (auth, msg)) >- return auth; >- >-+ if (soup_message_get_flags (msg) & SOUP_MESSAGE_DO_NOT_USE_AUTH_CACHE) >-+ return NULL; >-+ >- return priv->proxy_auth; >- } >- >-diff --git a/tests/auth-test.c b/tests/auth-test.c >-index 23e22133..2d66da9e 100644 >---- a/tests/auth-test.c >-+++ b/tests/auth-test.c >-@@ -442,6 +442,12 @@ do_digest_nonce_test (SoupSession *session, >- got_401 ? "got" : "did not get"); >- soup_test_assert_message_status (msg, SOUP_STATUS_OK); >- >-+ if (expect_signal) { >-+ g_signal_handlers_disconnect_by_func (session, >-+ G_CALLBACK (digest_nonce_authenticate), >-+ NULL); >-+ } >-+ >- g_object_unref (msg); >- } >- >-@@ -1297,9 +1303,10 @@ do_message_do_not_use_auth_cache_test (void) >- { >- SoupSession *session; >- SoupAuthManager *manager; >-+ SoupMessage *msg; >-+ SoupMessageFlags flags; >- SoupURI *soup_uri; >- char *uri; >-- char *uri_with_credentials; >- >- SOUP_TEST_SKIP_IF_NO_APACHE; >- >-@@ -1318,18 +1325,32 @@ do_message_do_not_use_auth_cache_test (void) >- soup_uri = soup_uri_new (uri); >- soup_uri_set_user (soup_uri, "user1"); >- soup_uri_set_password (soup_uri, "realm1"); >-- uri_with_credentials = soup_uri_to_string (soup_uri, FALSE); >-+ msg = soup_message_new_from_uri (SOUP_METHOD_GET, soup_uri); >-+ flags = soup_message_get_flags (msg); >-+ soup_message_set_flags (msg, flags | SOUP_MESSAGE_DO_NOT_USE_AUTH_CACHE); >-+ soup_session_send_message (session, msg); >-+ soup_test_assert_message_status (msg, SOUP_STATUS_OK); >-+ g_object_unref (msg); >- soup_uri_free (soup_uri); >-- do_digest_nonce_test (session, "Fourth", uri_with_credentials, FALSE, TRUE, FALSE); >-- g_free (uri_with_credentials); >- >- manager = SOUP_AUTH_MANAGER (soup_session_get_feature (session, SOUP_TYPE_AUTH_MANAGER)); >-+ >- soup_auth_manager_clear_cached_credentials (manager); >- >- /* Now check that credentials are not stored */ >- do_digest_nonce_test (session, "First", uri, FALSE, TRUE, TRUE); >- do_digest_nonce_test (session, "Second", uri, TRUE, TRUE, TRUE); >- do_digest_nonce_test (session, "Third", uri, TRUE, FALSE, FALSE); >-+ >-+ /* Credentials were stored for uri, but if we set SOUP_MESSAGE_DO_NOT_USE_AUTH_CACHE flag, >-+ * and we don't have the authenticate signal, it should respond with 401 >-+ */ >-+ msg = soup_message_new (SOUP_METHOD_GET, uri); >-+ flags = soup_message_get_flags (msg); >-+ soup_message_set_flags (msg, flags | SOUP_MESSAGE_DO_NOT_USE_AUTH_CACHE); >-+ soup_session_send_message (session, msg); >-+ soup_test_assert_message_status (msg, SOUP_STATUS_UNAUTHORIZED); >-+ g_object_unref (msg); >- g_free (uri); >- >- soup_test_session_abort_unref (session); >--- >-2.11.0 >- >diff --git a/Tools/gtk/patches/libsoup-soup-message-io-Do-not-fail-when-there-s-no-empty-li.patch b/Tools/gtk/patches/libsoup-soup-message-io-Do-not-fail-when-there-s-no-empty-li.patch >deleted file mode 100644 >index c5e471a530a766516034afe1d49606aee07cc3b1..0000000000000000000000000000000000000000 >--- a/Tools/gtk/patches/libsoup-soup-message-io-Do-not-fail-when-there-s-no-empty-li.patch >+++ /dev/null >@@ -1,74 +0,0 @@ >-From bb23caf7db4e9112089e1502aa8c106178095e7e Mon Sep 17 00:00:00 2001 >-From: Carlos Garcia Campos <cgarcia@igalia.com> >-Date: Tue, 21 Mar 2017 14:19:46 +0100 >-Subject: [PATCH] soup-message-io: Do not fail when there's no empty line after >- headers >- >-The spec says there should be an empty line (\r\n) between the response >-headers and the body. However, some servers don't include the empty line >-when the response doesn't have a body. This is causing several WebKit >-tests to fail, because some of the imported w3c tests do not include >-that empty line. Those tests pass in firefox, chromium and safari, so at >-least those other browsers allow that. >- >-https://bugzilla.gnome.org/show_bug.cgi?id=780352 >---- >- libsoup/soup-message-io.c | 34 ++++++++++++++++++++-------------- >- 1 file changed, 20 insertions(+), 14 deletions(-) >- >-diff --git a/libsoup/soup-message-io.c b/libsoup/soup-message-io.c >-index e893ec2a..ea02b1e3 100644 >---- a/libsoup/soup-message-io.c >-+++ b/libsoup/soup-message-io.c >-@@ -229,12 +229,16 @@ read_headers (SoupMessage *msg, gboolean blocking, >- cancellable, error); >- io->read_header_buf->len = old_len + MAX (nread, 0); >- if (nread == 0) { >-- soup_message_set_status (msg, SOUP_STATUS_MALFORMED); >-- g_set_error_literal (error, G_IO_ERROR, >-- G_IO_ERROR_PARTIAL_INPUT, >-- _("Connection terminated unexpectedly")); >-+ if (io->read_header_buf->len == 0) { >-+ soup_message_set_status (msg, SOUP_STATUS_MALFORMED); >-+ g_set_error_literal (error, G_IO_ERROR, >-+ G_IO_ERROR_PARTIAL_INPUT, >-+ _("Connection terminated unexpectedly")); >-+ return FALSE; >-+ } >-+ break; >- } >-- if (nread <= 0) >-+ if (nread < 0) >- return FALSE; >- >- if (got_lf) { >-@@ -251,15 +255,17 @@ read_headers (SoupMessage *msg, gboolean blocking, >- } >- } >- >-- /* We need to "rewind" io->read_header_buf back one line. >-- * That SHOULD be two characters (CR LF), but if the >-- * web server was stupid, it might only be one. >-- */ >-- if (io->read_header_buf->len < 3 || >-- io->read_header_buf->data[io->read_header_buf->len - 2] == '\n') >-- io->read_header_buf->len--; >-- else >-- io->read_header_buf->len -= 2; >-+ if (got_lf) { >-+ /* We need to "rewind" io->read_header_buf back one line. >-+ * That SHOULD be two characters (CR LF), but if the >-+ * web server was stupid, it might only be one. >-+ */ >-+ if (io->read_header_buf->len < 3 || >-+ io->read_header_buf->data[io->read_header_buf->len - 2] == '\n') >-+ io->read_header_buf->len--; >-+ else >-+ io->read_header_buf->len -= 2; >-+ } >- io->read_header_buf->data[io->read_header_buf->len] = '\0'; >- >- return TRUE; >--- >-2.11.0 >- >diff --git a/Tools/gtk/patches/libsoup-soup-socket-fix-critical-warning-when-the-peer-certi.patch b/Tools/gtk/patches/libsoup-soup-socket-fix-critical-warning-when-the-peer-certi.patch >deleted file mode 100644 >index 803b5d267e377d3c9dd8e43c22950974278591c7..0000000000000000000000000000000000000000 >--- a/Tools/gtk/patches/libsoup-soup-socket-fix-critical-warning-when-the-peer-certi.patch >+++ /dev/null >@@ -1,29 +0,0 @@ >-From e8995d4e1d5cf984cf10327c59808976425b2f9c Mon Sep 17 00:00:00 2001 >-From: Carlos Garcia Campos <cgarcia@igalia.com> >-Date: Fri, 20 Apr 2018 12:14:55 +0200 >-Subject: [PATCH] soup-socket: fix critical warning when the peer-certificate >- changes after disconnect >- >-(process:15586): GLib-GIO-CRITICAL **: 12:14:39.627: g_tls_connection_get_peer_certificate_errors: assertion 'G_IS_TLS_CONNECTION (conn)' failed >- >-We should disconnect the signal on disconnect_internal before clearing >-the connection object. >---- >- libsoup/soup-socket.c | 1 + >- 1 file changed, 1 insertion(+) >- >-diff --git a/libsoup/soup-socket.c b/libsoup/soup-socket.c >-index 5363dc72..311c627c 100644 >---- a/libsoup/soup-socket.c >-+++ b/libsoup/soup-socket.c >-@@ -188,6 +188,7 @@ disconnect_internal (SoupSocket *sock, gboolean close) >- g_clear_object (&priv->gsock); >- if (priv->conn && close) { >- g_io_stream_close (priv->conn, NULL, NULL); >-+ g_signal_handlers_disconnect_by_data (priv->conn, sock); >- g_clear_object (&priv->conn); >- } >- >--- >-2.19.1 >- >diff --git a/Tools/wpe/jhbuild.modules b/Tools/wpe/jhbuild.modules >index edc26cd6b13a65f95e036017bf8692200833b7d9..b31b17828d4d7d6391072851c020a72625aa3f01 100644 >--- a/Tools/wpe/jhbuild.modules >+++ b/Tools/wpe/jhbuild.modules >@@ -77,26 +77,24 @@ > </branch> > </meson> > >- <autotools id="glib-networking" >- autogen-sh="configure"> >+ <meson id="glib-networking"> > <dependencies> > <dep package="glib"/> > </dependencies> >- <branch module="/pub/GNOME/sources/glib-networking/2.54/glib-networking-2.54.1.tar.xz" version="2.54.1" >+ <branch module="/pub/GNOME/sources/glib-networking/2.58/glib-networking-${version}.tar.xz" version="2.58.0" > repo="ftp.gnome.org" >- hash="sha256:eaa787b653015a0de31c928e9a17eb57b4ce23c8cf6f277afaec0d685335012f"/> >- </autotools> >+ hash="sha256:bdfa0255e031b8ee003cc283002536b77ee76450105f1dc6ab066b9bf4330068"/> >+ </meson> > > <autotools id="libsoup" > autogen-sh="configure" >- autogenargs="--without-gnome --disable-introspection"> >+ autogenargs="--disable-introspection"> > <dependencies> > <dep package="glib-networking"/> > </dependencies> >- <branch module="/pub/GNOME/sources/libsoup/2.60/libsoup-2.60.3.tar.xz" version="2.60.3" >+ <branch module="/pub/GNOME/sources/libsoup/2.64/libsoup-${version}.tar.xz" version="2.64.2" > repo="ftp.gnome.org" >- hash="sha256:1b0dc762f23abe4e0d29b77370e539fd35f31d8e8e0318d6ddccff395be68a22"> >- <patch file="libsoup-soup-socket-fix-critical-warning-when-the-peer-certi.patch" strip="1"/> >+ hash="sha256:75ddc194a5b1d6f25033bb9d355f04bfe5c03e0e1c71ed0774104457b3a786c6"> > </branch> > </autotools> > >diff --git a/Tools/wpe/patches/libsoup-soup-socket-fix-critical-warning-when-the-peer-certi.patch b/Tools/wpe/patches/libsoup-soup-socket-fix-critical-warning-when-the-peer-certi.patch >deleted file mode 100644 >index 803b5d267e377d3c9dd8e43c22950974278591c7..0000000000000000000000000000000000000000 >--- a/Tools/wpe/patches/libsoup-soup-socket-fix-critical-warning-when-the-peer-certi.patch >+++ /dev/null >@@ -1,29 +0,0 @@ >-From e8995d4e1d5cf984cf10327c59808976425b2f9c Mon Sep 17 00:00:00 2001 >-From: Carlos Garcia Campos <cgarcia@igalia.com> >-Date: Fri, 20 Apr 2018 12:14:55 +0200 >-Subject: [PATCH] soup-socket: fix critical warning when the peer-certificate >- changes after disconnect >- >-(process:15586): GLib-GIO-CRITICAL **: 12:14:39.627: g_tls_connection_get_peer_certificate_errors: assertion 'G_IS_TLS_CONNECTION (conn)' failed >- >-We should disconnect the signal on disconnect_internal before clearing >-the connection object. >---- >- libsoup/soup-socket.c | 1 + >- 1 file changed, 1 insertion(+) >- >-diff --git a/libsoup/soup-socket.c b/libsoup/soup-socket.c >-index 5363dc72..311c627c 100644 >---- a/libsoup/soup-socket.c >-+++ b/libsoup/soup-socket.c >-@@ -188,6 +188,7 @@ disconnect_internal (SoupSocket *sock, gboolean close) >- g_clear_object (&priv->gsock); >- if (priv->conn && close) { >- g_io_stream_close (priv->conn, NULL, NULL); >-+ g_signal_handlers_disconnect_by_data (priv->conn, sock); >- g_clear_object (&priv->conn); >- } >- >--- >-2.19.1 >-
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=357256">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 192678
:
357256
|
357257