Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libsoup for openSUSE:Factory checked in at 2023-10-29 19:39:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libsoup (Old) and /work/SRC/openSUSE:Factory/.libsoup.new.17445 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libsoup" Sun Oct 29 19:39:40 2023 rev:144 rq:1120815 version:3.4.4 Changes: -------- --- /work/SRC/openSUSE:Factory/libsoup/libsoup.changes 2023-09-20 13:22:17.435815755 +0200 +++ /work/SRC/openSUSE:Factory/.libsoup.new.17445/libsoup.changes 2023-10-29 19:39:45.426916490 +0100 @@ -1,0 +2,7 @@ +Thu Oct 26 19:15:00 UTC 2023 - Bjørn Lie <bjorn....@gmail.com> + +- Update to version 3.4.4: + + Improve HTTP/2 performance when a lot of buffering happens + + Support building libnghttp2 as a subproject + +------------------------------------------------------------------- Old: ---- libsoup-3.4.3.tar.xz New: ---- libsoup-3.4.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsoup.spec ++++++ --- /var/tmp/diff_new_pack.cQFvr7/_old 2023-10-29 19:39:45.982936718 +0100 +++ /var/tmp/diff_new_pack.cQFvr7/_new 2023-10-29 19:39:45.982936718 +0100 @@ -18,7 +18,7 @@ %define api_version 3.0 Name: libsoup -Version: 3.4.3 +Version: 3.4.4 Release: 0 Summary: HTTP client/server library for GNOME License: LGPL-2.1-or-later ++++++ libsoup-3.4.3.tar.xz -> libsoup-3.4.4.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsoup-3.4.3/NEWS new/libsoup-3.4.4/NEWS --- old/libsoup-3.4.3/NEWS 2023-09-15 17:00:37.000000000 +0200 +++ new/libsoup-3.4.4/NEWS 2023-10-26 21:03:53.000000000 +0200 @@ -1,3 +1,8 @@ +Changes in libsoup from 3.4.3 to 3.4.4: + +* Improve HTTP/2 performance when a lot of buffering happens [Keyu Tao] +* Support building libnghttp2 as a subproject [hrxi] + Changes in libsoup from 3.4.2 to 3.4.3: * Fix incorrect UTF-8 encoding for params in headers [Leo Zi-You Assini] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsoup-3.4.3/libsoup/http2/soup-body-input-stream-http2.c new/libsoup-3.4.4/libsoup/http2/soup-body-input-stream-http2.c --- old/libsoup-3.4.3/libsoup/http2/soup-body-input-stream-http2.c 2023-09-15 17:00:37.000000000 +0200 +++ new/libsoup-3.4.4/libsoup/http2/soup-body-input-stream-http2.c 2023-10-26 21:03:53.000000000 +0200 @@ -42,7 +42,7 @@ }; typedef struct { - GSList *chunks; + GQueue *chunks; gsize start_offset; gsize len; gsize pos; @@ -89,7 +89,7 @@ priv = soup_body_input_stream_http2_get_instance_private (stream); - priv->chunks = g_slist_append (priv->chunks, g_bytes_new (data, size)); + g_queue_push_tail (priv->chunks, g_bytes_new (data, size)); priv->len += size; if (priv->need_more_data_cancellable) { g_cancellable_cancel (priv->need_more_data_cancellable); @@ -118,7 +118,7 @@ { SoupBodyInputStreamHttp2 *memory_stream; SoupBodyInputStreamHttp2Private *priv; - GSList *l; + GList *l; GBytes *chunk; gsize len; gsize offset, start, rest, size; @@ -135,7 +135,7 @@ count = MIN (read_count, priv->len - priv->pos); offset = priv->start_offset; - for (l = priv->chunks; l; l = l->next) { + for (l = g_queue_peek_head_link(priv->chunks); l; l = l->next) { chunk = (GBytes *)l->data; len = g_bytes_get_size (chunk); @@ -150,7 +150,7 @@ rest = count; while (l && rest > 0) { - GSList *next = l->next; + GList *next = l->next; const guint8 *chunk_data; chunk = (GBytes *)l->data; @@ -165,7 +165,7 @@ /* Remove fully read chunk from list, note that we are always near the start of the list */ if (start + size == len) { priv->start_offset += len; - priv->chunks = g_slist_delete_link (priv->chunks, l); + g_queue_delete_link (priv->chunks, l); g_bytes_unref (chunk); } @@ -256,12 +256,12 @@ /* Remove all skipped chunks */ gsize offset = priv->start_offset; - for (GSList *l = priv->chunks; l; l = l->next) { + for (GList *l = g_queue_peek_head_link(priv->chunks); l; l = l->next) { GBytes *chunk = (GBytes *)l->data; gsize chunk_len = g_bytes_get_size (chunk); if (offset + chunk_len <= priv->pos) { - priv->chunks = g_slist_delete_link (priv->chunks, l); + g_queue_delete_link (priv->chunks, l); g_bytes_unref (chunk); offset += chunk_len; } @@ -383,7 +383,7 @@ SoupBodyInputStreamHttp2 *stream = SOUP_BODY_INPUT_STREAM_HTTP2 (object); SoupBodyInputStreamHttp2Private *priv = soup_body_input_stream_http2_get_instance_private (stream); - g_slist_free_full (priv->chunks, (GDestroyNotify)g_bytes_unref); + g_queue_free_full (priv->chunks, (GDestroyNotify)g_bytes_unref); G_OBJECT_CLASS (soup_body_input_stream_http2_parent_class)->finalize (object); } @@ -399,6 +399,10 @@ static void soup_body_input_stream_http2_init (SoupBodyInputStreamHttp2 *stream) { + SoupBodyInputStreamHttp2Private *priv; + + priv = soup_body_input_stream_http2_get_instance_private (stream); + priv->chunks = g_queue_new (); } static void diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsoup-3.4.3/libsoup/soup-session.c new/libsoup-3.4.4/libsoup/soup-session.c --- old/libsoup-3.4.3/libsoup/soup-session.c 2023-09-15 17:00:37.000000000 +0200 +++ new/libsoup-3.4.4/libsoup/soup-session.c 2023-10-26 21:03:53.000000000 +0200 @@ -107,9 +107,6 @@ SoupMessageQueueItem *item, gboolean loop); -static void async_send_request_return_result (SoupMessageQueueItem *item, - gpointer stream, GError *error); - #define SOUP_SESSION_MAX_CONNS_DEFAULT 10 #define SOUP_SESSION_MAX_CONNS_PER_HOST_DEFAULT 2 @@ -1369,20 +1366,7 @@ return item; } -static gboolean -finish_request_if_item_cancelled (SoupMessageQueueItem *item) -{ - if (!g_cancellable_is_cancelled (item->cancellable)) - return FALSE; - - if (item->async) - async_send_request_return_result (item, NULL, NULL); - - item->state = SOUP_MESSAGE_FINISHING; - return TRUE; -} - -static gboolean +static void soup_session_send_queue_item (SoupSession *session, SoupMessageQueueItem *item, SoupMessageIOCompletionFn completion_cb) @@ -1421,13 +1405,9 @@ soup_message_headers_set_content_length (request_headers, 0); } - soup_message_starting (item->msg); - finish_request_if_item_cancelled (item); - if (item->state != SOUP_MESSAGE_RUNNING) - return FALSE; - - soup_message_send_item (item->msg, item, completion_cb, item); - return TRUE; + soup_message_starting (item->msg); + if (item->state == SOUP_MESSAGE_RUNNING) + soup_message_send_item (item->msg, item, completion_cb, item); } static void @@ -1561,19 +1541,15 @@ g_object_unref (conn); g_clear_object (&tunnel_item->error); tunnel_item->state = SOUP_MESSAGE_RUNNING; - if (soup_session_send_queue_item (session, tunnel_item, (SoupMessageIOCompletionFn)tunnel_message_completed)) - soup_message_io_run (msg, !tunnel_item->async); - else - tunnel_message_completed (msg, SOUP_MESSAGE_IO_INTERRUPTED, tunnel_item); + soup_session_send_queue_item (session, tunnel_item, + (SoupMessageIOCompletionFn)tunnel_message_completed); + soup_message_io_run (msg, !tunnel_item->async); return; } item->state = SOUP_MESSAGE_RESTARTING; } - if (item->state == SOUP_MESSAGE_FINISHING) - soup_message_finished (tunnel_item->msg); - tunnel_item->state = SOUP_MESSAGE_FINISHED; soup_session_unqueue_item (session, tunnel_item); @@ -1625,10 +1601,9 @@ g_clear_object (&conn); tunnel_item->state = SOUP_MESSAGE_RUNNING; - if (soup_session_send_queue_item (session, tunnel_item, (SoupMessageIOCompletionFn)tunnel_message_completed)) - soup_message_io_run (msg, !item->async); - else - tunnel_message_completed (msg, SOUP_MESSAGE_IO_INTERRUPTED, tunnel_item); + soup_session_send_queue_item (session, tunnel_item, + (SoupMessageIOCompletionFn)tunnel_message_completed); + soup_message_io_run (msg, !item->async); g_object_unref (msg); } @@ -1767,24 +1742,20 @@ switch (item->state) { case SOUP_MESSAGE_STARTING: - if (!finish_request_if_item_cancelled (item)) { - if (!soup_session_ensure_item_connection (session, item)) - return; - } + if (!soup_session_ensure_item_connection (session, item)) + return; break; - case SOUP_MESSAGE_CONNECTED: - if (!finish_request_if_item_cancelled (item)) { - SoupConnection *conn = soup_message_get_connection (item->msg); + case SOUP_MESSAGE_CONNECTED: { + SoupConnection *conn = soup_message_get_connection (item->msg); - if (soup_connection_is_tunnelled (conn)) + if (soup_connection_is_tunnelled (conn)) tunnel_connect (item); - else - item->state = SOUP_MESSAGE_READY; - g_object_unref (conn); - } + else + item->state = SOUP_MESSAGE_READY; + g_object_unref (conn); break; - + } case SOUP_MESSAGE_READY: if (item->connect_only) { item->state = SOUP_MESSAGE_FINISHING; @@ -1796,17 +1767,16 @@ break; } - if (!finish_request_if_item_cancelled (item)) { - item->state = SOUP_MESSAGE_RUNNING; + item->state = SOUP_MESSAGE_RUNNING; - soup_message_set_metrics_timestamp (item->msg, SOUP_MESSAGE_METRICS_REQUEST_START); + soup_message_set_metrics_timestamp (item->msg, SOUP_MESSAGE_METRICS_REQUEST_START); - if (soup_session_send_queue_item (session, item, (SoupMessageIOCompletionFn)message_completed) && item->async) - async_send_request_running (session, item); + soup_session_send_queue_item (session, item, + (SoupMessageIOCompletionFn)message_completed); - return; - } - break; + if (item->async) + async_send_request_running (session, item); + return; case SOUP_MESSAGE_RUNNING: if (item->async) @@ -3222,10 +3192,8 @@ while (!stream) { /* Get a connection, etc */ soup_session_process_queue_item (session, item, TRUE); - if (item->state != SOUP_MESSAGE_RUNNING) { - g_cancellable_set_error_if_cancelled (item->cancellable, &my_error); + if (item->state != SOUP_MESSAGE_RUNNING) break; - } /* Send request, read headers */ if (!soup_message_io_run_until_read (msg, item->cancellable, &my_error)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsoup-3.4.3/meson.build new/libsoup-3.4.4/meson.build --- old/libsoup-3.4.3/meson.build 2023-09-15 17:00:37.000000000 +0200 +++ new/libsoup-3.4.4/meson.build 2023-10-26 21:03:53.000000000 +0200 @@ -1,5 +1,5 @@ project('libsoup', 'c', - version: '3.4.3', + version: '3.4.4', meson_version : '>= 0.54', license : 'LGPL-2.0-or-later', default_options : [ @@ -18,7 +18,7 @@ # - If binary compatibility has been broken (eg removed or changed interfaces) # change to [C+1, 0, 0] # - If the interface is the same as the previous version, use [C, R+1, A]. -soup_version_info = [7, 0, 7] +soup_version_info = [7, 1, 7] # Turn [C, R, A] into an actual usable *soversion*. soup_soversion_major = soup_version_info[0] - soup_version_info[2] # Current-Age @@ -113,7 +113,7 @@ cdata = configuration_data() libnghttp2_dep = dependency('libnghttp2') -if cc.has_function('nghttp2_option_set_no_rfc9113_leading_and_trailing_ws_validation', prefix : '#include <nghttp2/nghttp2.h>', dependencies : libnghttp2_dep) +if (libnghttp2_dep.version() == 'unknown' and (libnghttp2_dep.type_name() == 'internal' or cc.has_function('nghttp2_option_set_no_rfc9113_leading_and_trailing_ws_validation', prefix : '#include <nghttp2/nghttp2.h>', dependencies : libnghttp2_dep))) or libnghttp2_dep.version().version_compare('>=1.50') cdata.set('HAVE_NGHTTP2_OPTION_SET_NO_RFC9113_LEADING_AND_TRAILING_WS_VALIDATION', '1') endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsoup-3.4.3/po/eo.po new/libsoup-3.4.4/po/eo.po --- old/libsoup-3.4.3/po/eo.po 2023-09-15 17:00:37.000000000 +0200 +++ new/libsoup-3.4.4/po/eo.po 2023-10-26 21:03:53.000000000 +0200 @@ -1,180 +1,216 @@ # Esperanto translation for libsoup. # Copyright (C) 2012 Free Software Foundation, Inc. # This file is distributed under the same license as the libsoup package. -# Kristjan SCHMIDT <kristjan.schm...@googlemail.com>, 2012, 2017. +# Kristjan SCHMIDT <kristjan.schm...@googlemail.com>, 2012-2023. +# msgid "" msgstr "" "Project-Id-Version: libsoup master\n" -"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=libsou" -"p&keywords=I18N+L10N&component=Misc\n" -"POT-Creation-Date: 2017-02-23 10:17+0000\n" -"PO-Revision-Date: 2017-06-11 12:37+0200\n" +"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libsoup/issues\n" +"POT-Creation-Date: 2023-01-25 21:07+0000\n" +"PO-Revision-Date: 2023-09-20 00:03+0200\n" "Last-Translator: Kristjan SCHMIDT <kristjan.schm...@googlemail.com>\n" "Language-Team: Esperanto <gnome-eo-l...@gnome.org>\n" "Language: eo\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Virtaal 0.7.1\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"X-Generator: Gtranslator 42.0\n" "X-Project-Style: gnome\n" -#: ../libsoup/soup-body-input-stream.c:139 -#: ../libsoup/soup-body-input-stream.c:170 -#: ../libsoup/soup-body-input-stream.c:203 ../libsoup/soup-message-io.c:235 +#: libsoup/cache/soup-cache-input-stream.c:70 +msgid "Network stream unexpectedly closed" +msgstr "Reta fluo neatatendite fermiÄis" + +#: libsoup/cache/soup-cache-input-stream.c:252 +msgid "Failed to completely cache the resource" +msgstr "Malsukcesis tute konservi la rimedon en kaÅmemoro" + +#: libsoup/content-decoder/soup-converter-wrapper.c:197 +#, c-format +msgid "Output buffer is too small" +msgstr "La elig-bufro estas tro malgranda" + +#: libsoup/http1/soup-body-input-stream.c:155 +#: libsoup/http1/soup-body-input-stream.c:187 +#: libsoup/http1/soup-body-input-stream.c:220 +#: libsoup/http1/soup-message-io-data.c:77 +#: libsoup/http2/soup-client-message-io-http2.c:408 +#: libsoup/server/http2/soup-server-message-io-http2.c:431 msgid "Connection terminated unexpectedly" msgstr "La konekto estas neatendite fermita" -#: ../libsoup/soup-body-input-stream.c:459 +#: libsoup/http1/soup-body-input-stream.c:471 msgid "Invalid seek request" msgstr "Nevalida serÄ-peto" -#: ../libsoup/soup-body-input-stream.c:487 +#: libsoup/http1/soup-body-input-stream.c:499 msgid "Cannot truncate SoupBodyInputStream" msgstr "Ne eblas trunki SoupBodyInputStream-on" -#: ../libsoup/soup-cache-input-stream.c:76 -msgid "Network stream unexpectedly closed" -msgstr "Reta fluo neatatendite fermiÄis" - -#: ../libsoup/soup-cache-input-stream.c:291 -msgid "Failed to completely cache the resource" -msgstr "" - -#: ../libsoup/soup-converter-wrapper.c:189 -#, c-format -msgid "Output buffer is too small" -msgstr "La elig-bufro estas tro malgranda" +#: libsoup/http1/soup-client-message-io-http1.c:322 +#: libsoup/http1/soup-client-message-io-http1.c:775 +#: libsoup/http2/soup-body-input-stream-http2.c:221 +#: libsoup/server/http1/soup-server-message-io-http1.c:417 +#: libsoup/server/http1/soup-server-message-io-http1.c:890 +msgid "Operation would block" +msgstr "La operacio estus haltigota" -#: ../libsoup/soup-message-client-io.c:41 -#| msgid "Could not parse URI '%s'" +#: libsoup/http1/soup-client-message-io-http1.c:463 msgid "Could not parse HTTP response" msgstr "Ne eblis analizi HTTP-respondon" -#: ../libsoup/soup-message-client-io.c:66 +#: libsoup/http1/soup-client-message-io-http1.c:486 msgid "Unrecognized HTTP response encoding" -msgstr "" +msgstr "Nerekonita HTTP-responda kodado" -#: ../libsoup/soup-message-io.c:392 ../libsoup/soup-message-io.c:1020 -msgid "Operation would block" -msgstr "La operacio estus haltigota" - -#: ../libsoup/soup-message-io.c:972 ../libsoup/soup-message-io.c:1005 +#: libsoup/http1/soup-client-message-io-http1.c:734 +#: libsoup/http1/soup-client-message-io-http1.c:760 +#: libsoup/http2/soup-client-message-io-http2.c:1640 +#: libsoup/http2/soup-client-message-io-http2.c:1666 msgid "Operation was cancelled" msgstr "La operacio estas Äesigita" -#: ../libsoup/soup-message-server-io.c:64 -#| msgid "Could not parse URI '%s'" -msgid "Could not parse HTTP request" -msgstr "Ne eblis analizi HTTP-peton" +#: libsoup/http1/soup-message-io-data.c:105 +msgid "Header too big" +msgstr "Kaplinio tro granda" -#: ../libsoup/soup-request.c:141 -#, c-format -msgid "No URI provided" -msgstr "Neniu URI estas diponigita" +#: libsoup/server/soup-listener.c:261 +msgid "Could not import existing socket: " +msgstr "Ne eblis enporti ekzistantan ingon:" -#: ../libsoup/soup-request.c:151 -#, c-format -#| msgid "Invalid '%s' URI: %s" -msgid "Invalid â%sâ URI: %s" -msgstr "Nevalida â%sâ URI: %s" +#: libsoup/server/soup-listener.c:267 +msgid "Canât import unconnected socket" +msgstr "Ne povas enporti nekonektitan ingon" -#: ../libsoup/soup-server.c:1725 +#: libsoup/server/soup-server.c:1217 msgid "Canât create a TLS server without a TLS certificate" -msgstr "" +msgstr "Ne povas krei TLS-servilon sen TLS-atestilo" -#: ../libsoup/soup-server.c:1742 -#, c-format -msgid "Could not listen on address %s, port %d: " -msgstr "" +#: libsoup/soup-session.c:1133 +msgid "Location header is missing or empty in response headers" +msgstr "Loka kaplinio mankas aÅ estas malplena en respondkapoj" -#: ../libsoup/soup-session.c:4518 +#: libsoup/soup-session.c:1147 #, c-format -#| msgid "Could not parse URI '%s'" -msgid "Could not parse URI â%sâ" -msgstr "Ne eblis analizi na URI â%sâ" +msgid "Invalid URI â%sâ in Location response header" +msgstr "Nevalida URI â%sâ en loka respondkapo" -#: ../libsoup/soup-session.c:4555 -#, c-format -#| msgid "Unsupported URI scheme '%s'" -msgid "Unsupported URI scheme â%sâ" -msgstr "Nesubtenata URI-skemo â%sâ" +#: libsoup/soup-session.c:1167 +msgid "Too many redirects" +msgstr "Tro da alidirektiloj" -#: ../libsoup/soup-session.c:4577 -#, c-format -msgid "Not an HTTP URI" -msgstr "" +#: libsoup/soup-session.c:1172 +msgid "Message was restarted too many times" +msgstr "MesaÄo estis rekomencita tro multajn fojojn" -#: ../libsoup/soup-session.c:4763 +#: libsoup/soup-session.c:3038 libsoup/soup-session.c:3186 +msgid "Message is already in session queue" +msgstr "MesaÄo jam estas en vico de sesio" + +#: libsoup/soup-session.c:3662 msgid "The server did not accept the WebSocket handshake." -msgstr "" +msgstr "La servilo ne akceptis la manpremon de WebSocket." -#: ../libsoup/soup-socket.c:148 -msgid "Canât import non-socket as SoupSocket" -msgstr "" +#: libsoup/soup-tld.c:129 +msgid "No public-suffix list available." +msgstr "Neniu publika sufiksa listo havebla." -#: ../libsoup/soup-socket.c:166 -msgid "Could not import existing socket: " -msgstr "" +#: libsoup/soup-tld.c:139 libsoup/soup-tld.c:155 +msgid "Invalid hostname" +msgstr "Nevalida komputilnomo" -#: ../libsoup/soup-socket.c:175 -msgid "Canât import unconnected socket" -msgstr "" +#: libsoup/soup-tld.c:146 +msgid "Hostname is an IP address" +msgstr "La komputilnomo estas IP-adreso" -#: ../libsoup/soup-websocket.c:338 ../libsoup/soup-websocket.c:347 +#: libsoup/soup-tld.c:167 +msgid "Hostname has no base domain" +msgstr "La komputilnomo ne havas Äefan retregionon" + +#: libsoup/soup-tld.c:175 +msgid "Not enough domains" +msgstr "Ne sufiÄe da retregionoj" + +#: libsoup/websocket/soup-websocket.c:391 +#: libsoup/websocket/soup-websocket.c:435 +#: libsoup/websocket/soup-websocket.c:451 +msgid "Server requested unsupported extension" +msgstr "Servilo petis nesubtenitan etendon" + +#: libsoup/websocket/soup-websocket.c:414 +#: libsoup/websocket/soup-websocket.c:606 +#, c-format +msgid "Incorrect WebSocket â%sâ header" +msgstr "MalÄusta WebSocket \"%s\" kaplinio" + +#: libsoup/websocket/soup-websocket.c:415 +#: libsoup/websocket/soup-websocket.c:870 +#, c-format +msgid "Server returned incorrect â%sâ key" +msgstr "Servilo redonis malÄustan Ålosilon â%sâ" + +#: libsoup/websocket/soup-websocket.c:478 +#, c-format +msgid "Duplicated parameter in â%sâ WebSocket extension header" +msgstr "Duplikita parametro en \"%s\" WebSocket-etendkapo" + +#: libsoup/websocket/soup-websocket.c:479 +#, c-format +msgid "" +"Server returned a duplicated parameter in â%sâ WebSocket extension header" +msgstr "Servilo resendis duobligitan parametron en \"%s\" WebSocket-etendkapo" + +#: libsoup/websocket/soup-websocket.c:569 +#: libsoup/websocket/soup-websocket.c:579 msgid "WebSocket handshake expected" -msgstr "" +msgstr "WebSocket manpremo atendita" -#: ../libsoup/soup-websocket.c:355 +#: libsoup/websocket/soup-websocket.c:587 msgid "Unsupported WebSocket version" msgstr "Nesubtenata WebSocket-versio" -#: ../libsoup/soup-websocket.c:364 +#: libsoup/websocket/soup-websocket.c:596 msgid "Invalid WebSocket key" msgstr "Nevalida WebSocket-Ålosilo" -#: ../libsoup/soup-websocket.c:374 -#, c-format -msgid "Incorrect WebSocket â%sâ header" -msgstr "" - -#: ../libsoup/soup-websocket.c:383 +#: libsoup/websocket/soup-websocket.c:615 msgid "Unsupported WebSocket subprotocol" -msgstr "" +msgstr "Nesubtenata WebSocket-subprotokolo" -#: ../libsoup/soup-websocket.c:510 +#: libsoup/websocket/soup-websocket.c:821 msgid "Server rejected WebSocket handshake" -msgstr "" +msgstr "Servilo malakceptis WebSocket manpremon" -#: ../libsoup/soup-websocket.c:518 ../libsoup/soup-websocket.c:527 +#: libsoup/websocket/soup-websocket.c:829 +#: libsoup/websocket/soup-websocket.c:838 msgid "Server ignored WebSocket handshake" -msgstr "" +msgstr "Servilo ignoris WebSocket manpremon" -#: ../libsoup/soup-websocket.c:539 +#: libsoup/websocket/soup-websocket.c:850 msgid "Server requested unsupported protocol" msgstr "Servilo petis nesubtenatan protokolon" -#: ../libsoup/soup-websocket.c:549 -msgid "Server requested unsupported extension" -msgstr "" +#~| msgid "Could not parse URI '%s'" +#~ msgid "Could not parse HTTP request" +#~ msgstr "Ne eblis analizi HTTP-peton" -#: ../libsoup/soup-websocket.c:562 #, c-format -msgid "Server returned incorrect â%sâ key" -msgstr "Servilo redonis malÄustan Ålosilon â%sâ" - -#: ../libsoup/soup-tld.c:188 -msgid "Hostname is an IP address" -msgstr "La komputilnomo estas IP-adreso" +#~ msgid "No URI provided" +#~ msgstr "Neniu URI estas diponigita" -#: ../libsoup/soup-tld.c:198 ../libsoup/soup-tld.c:220 -msgid "Invalid hostname" -msgstr "Nevalida komputilnomo" +#, c-format +#~| msgid "Invalid '%s' URI: %s" +#~ msgid "Invalid â%sâ URI: %s" +#~ msgstr "Nevalida â%sâ URI: %s" -#: ../libsoup/soup-tld.c:250 -msgid "Hostname has no base domain" -msgstr "La komputilnomo ne havas Äefan retregionon" +#, c-format +#~| msgid "Could not parse URI '%s'" +#~ msgid "Could not parse URI â%sâ" +#~ msgstr "Ne eblis analizi na URI â%sâ" -#: ../libsoup/soup-tld.c:304 -msgid "Not enough domains" -msgstr "Ne sufiÄe da retregionoj" +#, c-format +#~| msgid "Unsupported URI scheme '%s'" +#~ msgid "Unsupported URI scheme â%sâ" +#~ msgstr "Nesubtenata URI-skemo â%sâ" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsoup-3.4.3/tests/connection-test.c new/libsoup-3.4.4/tests/connection-test.c --- old/libsoup-3.4.3/tests/connection-test.c 2023-09-15 17:00:37.000000000 +0200 +++ new/libsoup-3.4.4/tests/connection-test.c 2023-10-26 21:03:53.000000000 +0200 @@ -1693,61 +1693,6 @@ soup_test_session_abort_unref (session); } -static void -cancel_tunnel_test_request_queued (SoupSession *session, - SoupMessage *msg, - GCancellable *cancellable) -{ - if (soup_message_get_method (msg) != SOUP_METHOD_CONNECT) - return; - - g_signal_connect_swapped (msg, "starting", G_CALLBACK (g_cancellable_cancel), cancellable); -} - -static void -do_cancel_tunnel_msg_on_starting (void) -{ - SoupSession *session; - SoupMessage *msg; - GProxyResolver *resolver; - GCancellable *cancellable; - GBytes *body; - GError *error = NULL; - - SOUP_TEST_SKIP_IF_NO_TLS - SOUP_TEST_SKIP_IF_NO_APACHE; - - session = soup_test_session_new (NULL); - - if (tls_available) { - GTlsDatabase *tlsdb; - - tlsdb = g_tls_backend_get_default_database (g_tls_backend_get_default ()); - soup_session_set_tls_database (session, tlsdb); - g_object_unref (tlsdb); - } - - resolver = g_simple_proxy_resolver_new (HTTP_PROXY, NULL); - soup_session_set_proxy_resolver (session, resolver); - g_object_unref (resolver); - - cancellable = g_cancellable_new (); - g_signal_connect (session, "request-queued", - G_CALLBACK (cancel_tunnel_test_request_queued), - cancellable); - - msg = soup_message_new ("GET", HTTPS_SERVER); - body = soup_session_send_and_read (session, msg, cancellable, &error); - soup_test_assert_message_status (msg, SOUP_STATUS_NONE); - g_assert_error (error, G_IO_ERROR, G_IO_ERROR_CANCELLED); - g_clear_error (&error); - g_bytes_unref (body); - g_object_unref (msg); - g_object_unref (cancellable); - - soup_test_session_abort_unref (session); -} - int main (int argc, char **argv) { @@ -1774,7 +1719,6 @@ g_test_add_func ("/connection/metrics", do_connection_metrics_test); g_test_add_func ("/connection/force-http2", do_connection_force_http2_test); g_test_add_func ("/connection/http2/http-1-1-required", do_connection_http_1_1_required_test); - g_test_add_func ("/connection/cancel-tunnel-msg-on-starting", do_cancel_tunnel_msg_on_starting); ret = g_test_run (); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsoup-3.4.3/tests/misc-test.c new/libsoup-3.4.4/tests/misc-test.c --- old/libsoup-3.4.3/tests/misc-test.c 2023-09-15 17:00:37.000000000 +0200 +++ new/libsoup-3.4.4/tests/misc-test.c 2023-10-26 21:03:53.000000000 +0200 @@ -430,14 +430,6 @@ } static void -ea_message_queued (SoupSession *session, - SoupMessage *msg, - GCancellable *cancellable) -{ - g_cancellable_cancel (cancellable); -} - -static void do_early_abort_test (void) { SoupSession *session; @@ -496,22 +488,6 @@ g_object_unref (cancellable); g_object_unref (msg); soup_test_session_abort_unref (session); - - session = soup_test_session_new (NULL); - msg = soup_message_new_from_uri ("GET", base_uri); - cancellable = g_cancellable_new (); - - g_signal_connect (session, "request-queued", - G_CALLBACK (ea_message_queued), cancellable); - g_assert_null (soup_test_session_async_send (session, msg, cancellable, &error)); - debug_printf (2, " Message 4 completed\n"); - - g_assert_cmpuint (soup_message_get_connection_id (msg), ==, 0); - g_assert_error (error, G_IO_ERROR, G_IO_ERROR_CANCELLED); - g_clear_error (&error); - g_object_unref (cancellable); - g_object_unref (msg); - soup_test_session_abort_unref (session); } static void diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsoup-3.4.3/tests/ssl-test.c new/libsoup-3.4.4/tests/ssl-test.c --- old/libsoup-3.4.3/tests/ssl-test.c 2023-09-15 17:00:37.000000000 +0200 +++ new/libsoup-3.4.4/tests/ssl-test.c 2023-10-26 21:03:53.000000000 +0200 @@ -463,6 +463,7 @@ &error ); g_assert_no_error (error); + g_clear_error (&error); g_assert_nonnull (pkcs11_certificate); g_assert_true (G_IS_TLS_CERTIFICATE (pkcs11_certificate)); msg = soup_message_new_from_uri ("GET", uri); @@ -509,7 +510,7 @@ g_bytes_unref (body); g_object_unref (msg); - g_object_unref (pkcs11_certificate); + g_clear_object (&pkcs11_certificate); } g_object_set (server, "tls-database", NULL, "tls-auth-mode", G_TLS_AUTHENTICATION_NONE, NULL);