Skip to content
Commits on Source (10)
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml 0 → 100644
View file @ 3ed0d718
image: registry.gitlab.gnome.org/gnome/libsoup/master:v5
stages:
- build
- coverage
.build:
stage: build
tags:
# We need runners supporting IPv6:
# https://gitlab.gnome.org/Infrastructure/GitLab/issues/313
- ipv6
fedora-meson-x86_64:
extends: .build
variables:
CFLAGS: "-coverage -ftest-coverage -fprofile-arcs"
script:
- meson _build -Dauto_features=enabled
- ninja -C _build
- mkdir -p _coverage
- lcov --config-file .gitlab-ci/lcovrc --directory _build --capture --initial --output-file "_coverage/${CI_JOB_NAME}-baseline.lcov"
- ninja -C _build test
- lcov --config-file .gitlab-ci/lcovrc --directory _build --capture --output-file "_coverage/${CI_JOB_NAME}.lcov"
artifacts:
reports:
junit: "_build/${CI_JOB_NAME}-report.xml"
name: "libsoup-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
when: always
paths:
- "_build/config.h"
- "_build/meson-logs"
- "_build/${CI_JOB_NAME}-report.xml"
- "_coverage"
coverage:
stage: coverage
except:
- tags
artifacts:
name: "libsoup-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
paths:
- _coverage/
script:
- bash -x ./.gitlab-ci/coverage-docker.sh
coverage: '/^\s+lines\.+:\s+([\d.]+\%)\s+/'
.gitlab-ci/Dockerfile 0 → 100644
View file @ 3ed0d718
FROM fedora:31
RUN dnf update -y \
&& dnf install -y 'dnf-command(builddep)' \
&& dnf builddep -y libsoup \
&& dnf install -y brotli-devel \
git \
gtk-doc \
httpd \
lcov \
libpsl-devel \
make \
meson \
mod_ssl \
php \
php-xmlrpc \
redhat-rpm-config \
samba-winbind-clients \
which \
&& dnf clean all
ARG HOST_USER_ID=5555
ENV HOST_USER_ID ${HOST_USER_ID}
RUN useradd -u $HOST_USER_ID -ms /bin/bash user
USER user
WORKDIR /home/user
ENV LANG C.UTF-8
.gitlab-ci/README.md 0 → 100644
View file @ 3ed0d718
# CI support stuff
## Docker image
GitLab CI jobs run in a Docker image, defined here. To update that image
(perhaps to install some more packages):
1. Edit `.gitlab-ci/Dockerfile` with the changes you want
2. Edit `.gitlab-ci/run-docker.sh` and bump the version in `TAG`
3. Run `.gitlab-ci/run-docker.sh` to build the new image, and launch a shell
inside it
* When you're done, exit the shell in the usual way
4. Run `.gitlab-ci/run-docker.sh --push` to upload the new image to the GNOME
GitLab Docker registry
* If this is the first time you're doing this, you'll need to log into the
registry
* If you use 2-factor authentication on your GNOME GitLab account, you'll
need to [create a personal access token][pat] and use that rather than
your normal password
5. Edit `.gitlab-ci.yml` (in the root of this repository) to use your new
image
[pat]: https://gitlab.gnome.org/profile/personal_access_tokens
.gitlab-ci/coverage-docker.sh 0 → 100644
View file @ 3ed0d718
#!/bin/bash
set -e
# Fixup Windows paths
lcov_paths=$(find _coverage -name "*.lcov" -print)
python3 ./.gitlab-ci/fixup-cov-paths.py ${lcov_paths}
for path in _coverage/*.lcov; do
# Remove coverage from generated code in the build directory
lcov --config-file .gitlab-ci/lcovrc -r "${path}" '*/_build/*' -o "$(pwd)/${path}"
# Remove any coverage from system files
lcov --config-file .gitlab-ci/lcovrc -e "${path}" "$(pwd)/*" -o "$(pwd)/${path}"
done
genhtml \
--ignore-errors=source \
--config-file .gitlab-ci/lcovrc \
_coverage/*.lcov \
-o _coverage/coverage
cd _coverage
rm -f *.lcov
cat >index.html <<EOL
<html>
<body>
<ul>
<li><a href="coverage/index.html">Coverage</a></li>
</ul>
</body>
</html>
EOL
.gitlab-ci/fixup-cov-paths.py 0 → 100644
View file @ 3ed0d718
import sys
import os
import io
def main(argv):
# Fix paths in lcov files generated on a Windows host so they match our
# current source layout.
paths = argv[1:]
for path in paths:
print("cov-fixup:", path)
text = io.open(path, "r", encoding="utf-8").read()
text = text.replace("\\\\", "/")
libsoup_dir = "/libsoup/"
end = text.index(libsoup_dir)
start = text[:end].rindex(":") + 1
old_root = text[start:end]
assert os.path.basename(os.getcwd()) == "libsoup"
new_root = os.path.dirname(os.getcwd())
if old_root != new_root:
print("replacing %r with %r" % (old_root, new_root))
text = text.replace(old_root, new_root)
with io.open(path, "w", encoding="utf-8") as h:
h.write(text)
if __name__ == "__main__":
sys.exit(main(sys.argv))
.gitlab-ci/lcovrc 0 → 100644
View file @ 3ed0d718
# lcov and genhtml configuration
# See http://ltp.sourceforge.net/coverage/lcov/lcovrc.5.php
# Always enable branch coverage
lcov_branch_coverage = 1
# Exclude precondition assertions, as we can never reasonably get full branch
# coverage of them, as they should never normally fail.
# See https://github.com/linux-test-project/lcov/issues/44
lcov_excl_br_line = LCOV_EXCL_BR_LINE|g_return_if_fail|g_return_val_if_fail|g_assert|g_assert_
# Similarly for unreachable assertions.
lcov_excl_line = LCOV_EXCL_LINE|g_return_if_reached|g_return_val_if_reached|g_assert_not_reached
.gitlab-ci/run-docker.sh 0 → 100755
View file @ 3ed0d718
#!/bin/bash
set -e
TAG="registry.gitlab.gnome.org/gnome/libsoup/master:v5"
SUDO_CMD="sudo"
if docker -v |& grep -q podman; then
# Using podman
SUDO_CMD=""
# Docker is actually implemented by podman, and its OCI output
# is incompatible with some of the dockerd instances on GitLab
# CI runners.
export BUILDAH_FORMAT=docker
fi
cd "$(dirname "$0")"
$SUDO_CMD docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \
--file "Dockerfile" .
if [ "$1" = "--push" ]; then
$SUDO_CMD docker login registry.gitlab.gnome.org
$SUDO_CMD docker push $TAG
else
$SUDO_CMD docker run --rm \
--volume "$(pwd)/..:/home/user/app" --workdir "/home/user/app" \
--tty --interactive "${TAG}" bash
fi
NEWS
View file @ 3ed0d718
Changes in libsoup from 2.74.0 to 2.74.1:
* Fix support for older versions of Vala [Rico Tzschichholz]
* Fix trying to build sysprof as a subproject on Windows [Christoph Reiter]
* Fix missing `extern "C"` in an installed header [Patrick Griffis]
* Improve `gssapi` dependency handling [Nirbheek Chauhan]
* Fix `libsoup-doc` build target [Patrick Griffis]
* Updated translations: Danish, Russian
Changes in libsoup from 2.72.0 to 2.74.0:
* IMPORTANT: Enable ssl-use-system-ca-file by default on deprecated
......
docs/reference/meson.build
View file @ 3ed0d718
......@@ -52,7 +52,7 @@ mkdb_args = [
scan_args = [
'--deprecated-guards=SOUP_DISABLE_DEPRECATED',
'--rebuild-types',
'--ignore-decorators="SOUP_DEPRECATED\w*\s*\([^)]*\)|SOUP_DEPRECATED\w*|SOUP_AVAILABLE\w*"'
'--ignore-decorators="SOUP_DEPRECATED\w*\s*()|SOUP_DEPRECATED\w*|SOUP_AVAILABLE[\w_]*"'
]
gnome.gtkdoc('libsoup-2.4',
......
libsoup/Soup-2.4-custom.vala
View file @ 3ed0d718
......@@ -6,8 +6,10 @@ namespace Soup {
public Buffer.subbuffer (Soup.Buffer parent, size_t offset, size_t length);
}
#if !VALA_0_54
[Version (deprecated_since = "vala-0.22", replacement = "Status.get_phrase")]
public static unowned string status_get_phrase (uint status_code);
[Version (deprecated_since = "vala-0.22", replacement = "Status.proxify")]
public static uint status_proxify (uint status_code);
#endif
}
libsoup/Soup-2.4.metadata
View file @ 3ed0d718
......@@ -16,10 +16,6 @@ Requester deprecated_since="2.42" replacement="Session"
KnownStatusCode deprecated_since="2.44" replacement="Status"
ProxyResolver deprecated_since="2.28" replacement="ProxyURIResolver"
// Defined in Soup-2.4-custom.vala, see https://gitlab.gnome.org/GNOME/vala/-/commit/f3a8f1a6444ae0ab59ec4bd6496a7c1025785ad4
status_get_phrase skip
status_proxify skip
// Report upstream
add_* skip=false type="unowned GLib.TimeoutSource"
Auth
......
libsoup/meson.build
View file @ 3ed0d718
......@@ -249,6 +249,7 @@ deps = [
libpsl_dep,
brotlidec_dep,
platform_deps,
gssapi_dep,
libz_dep,
]
......@@ -275,7 +276,7 @@ pkg.generate(libsoup,
libsoup_dep = declare_dependency(link_with : libsoup,
include_directories : configinc,
sources : soup_enum_h,
dependencies : [ platform_deps, glib_deps ])
dependencies : [ platform_deps, gssapi_dep, glib_deps ])
if enable_gnome
soup_gnome_api_name = 'soup-gnome-' + apiversion
......
libsoup/soup-proxy-resolver-default.h
View file @ 3ed0d718
......@@ -8,6 +8,8 @@
#include <libsoup/soup-types.h>
G_BEGIN_DECLS
#define SOUP_PROXY_RESOLVER_DEFAULT(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), SOUP_TYPE_PROXY_RESOLVER_DEFAULT, SoupProxyResolverDefault))
#define SOUP_PROXY_RESOLVER_DEFAULT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SOUP_TYPE_PROXY_RESOLVER_DEFAULT, SoupProxyResolverDefaultClass))
#define SOUP_IS_PROXY_RESOLVER_DEFAULT(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), SOUP_TYPE_PROXY_RESOLVER_DEFAULT))
......@@ -28,4 +30,6 @@ SOUP_AVAILABLE_IN_2_4
GType soup_proxy_resolver_default_get_type (void);
#define SOUP_TYPE_PROXY_RESOLVER_DEFAULT (soup_proxy_resolver_default_get_type ())
G_END_DECLS
#endif /* __SOUP_PROXY_RESOLVER_DEFAULT_H__ */
libsoup/soup-session.c
View file @ 3ed0d718
......@@ -3416,7 +3416,7 @@ soup_session_class_init (SoupSessionClass *session_class)
* https certificate validation is handled.
*
* If you are using #SoupSessionAsync or
* #SoupSessionSync, on libsoup older than 2.72.1, the default value
* #SoupSessionSync, on libsoup older than 2.74.0, the default value
* is %FALSE, for backward compatibility.
*
* Since: 2.38
......@@ -3454,7 +3454,7 @@ soup_session_class_init (SoupSessionClass *session_class)
* #SoupSession:ssl-use-system-ca-file will be %TRUE by
* default, and so this property will be a copy of the system
* CA database. If you are using #SoupSessionAsync or
* #SoupSessionSync, on libsoup older than 2.72.1, this property
* #SoupSessionSync, on libsoup older than 2.74.0, this property
* will be %NULL by default.
*
* Since: 2.38
......
meson.build
View file @ 3ed0d718
project('libsoup', 'c',
version: '2.74.0',
version: '2.74.1',
meson_version : '>=0.50',
license : 'LGPL2',
default_options : 'c_std=c99')
......@@ -164,7 +164,9 @@ libsysprof_capture_dep = dependency('sysprof-capture-4',
'with_sysprofd=none',
'help=false',
],
fallback: ['sysprof', 'libsysprof_capture_dep'],
# sysprof doesn't support Windows, so don't fall back to the subproject which fails to build,
# instead let it fail here so that sysprof gets skipped
fallback: (host_system != 'windows') ? ['sysprof', 'libsysprof_capture_dep'] : [],
)
cdata.set('HAVE_SYSPROF', libsysprof_capture_dep.found())
......@@ -308,12 +310,11 @@ if cc.get_id() == 'msvc'
else
gssapi_lib_type = '64'
endif
gssapi_lib = cc.find_library('gssapi' + gssapi_lib_type,
gssapi_dep = cc.find_library('gssapi' + gssapi_lib_type,
has_headers: 'gssapi/gssapi.h',
required: gssapi_opt)
if gssapi_lib.found()
if gssapi_dep.found()
enable_gssapi = true
add_project_link_arguments('gssapi@0@.lib'.format(gssapi_lib_type), language : 'c')
endif
else
krb5_config_path = get_option('krb5_config')
......@@ -326,9 +327,12 @@ else
cflags_output = run_command (krb5_config, '--cflags', 'gssapi', check: gssapi_opt.enabled())
if libs_output.returncode() == 0 and cflags_output.returncode() == 0
enable_gssapi = true
add_project_link_arguments(libs_output.stdout().split(), language : 'c')
add_project_arguments(cflags_output.stdout().split(), language : 'c')
gssapi_dep = declare_dependency(
link_args: libs_output.stdout().split(),
compile_args: cflags_output.stdout().split())
endif
else
gssapi_dep = dependency('', required: false)
endif
endif
......
po/da.po
View file @ 3ed0d718
......@@ -8,18 +8,19 @@ msgid ""
msgstr ""
"Project-Id-Version: libsoup master\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libsoup/issues\n"
"POT-Creation-Date: 2019-07-31 12:10+0000\n"
"PO-Revision-Date: 2019-09-09 01:00+0200\n"
"Last-Translator: Ask Hjorth Larsen <asklarsen@gmail.com>\n"
"POT-Creation-Date: 2021-09-11 13:25+0000\n"
"PO-Revision-Date: 2021-09-13 14:27+0200\n"
"Last-Translator: Alan Mortensen <alanmortensen.am@gmail.com>\n"
"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
"Language: da\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: Poedit 2.3\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:236
#: libsoup/soup-body-input-stream.c:203 libsoup/soup-message-io.c:244
msgid "Connection terminated unexpectedly"
msgstr "Forbindelsen blev uventet afbrudt"
......@@ -40,6 +41,18 @@ msgstr "Netværksudsendelsen blev uventet lukket ned"
msgid "Failed to completely cache the resource"
msgstr "Kunne ikke lave fuldt mellemlager for ressourcen"
#: libsoup/soup-directory-input-stream.c:232
msgid "Name"
msgstr "Navn"
#: libsoup/soup-directory-input-stream.c:233
msgid "Size"
msgstr "Størrelse"
#: libsoup/soup-directory-input-stream.c:234
msgid "Date Modified"
msgstr "Ændringsdato"
#: libsoup/soup-converter-wrapper.c:189
#, c-format
msgid "Output buffer is too small"
......@@ -53,15 +66,15 @@ msgstr "Kunne ikke fortolke HTTP-svar"
msgid "Unrecognized HTTP response encoding"
msgstr "Ej genkendt HTTP-svarkodning"
#: libsoup/soup-message-io.c:261
#: libsoup/soup-message-io.c:269
msgid "Header too big"
msgstr "Teksthovedet er for stort"
#: libsoup/soup-message-io.c:393 libsoup/soup-message-io.c:1016
#: libsoup/soup-message-io.c:401 libsoup/soup-message-io.c:1024
msgid "Operation would block"
msgstr "Operationen ville blokere"
#: libsoup/soup-message-io.c:968 libsoup/soup-message-io.c:1001
#: libsoup/soup-message-io.c:976 libsoup/soup-message-io.c:1009
msgid "Operation was cancelled"
msgstr "Operationen blev annulleret"
......@@ -79,31 +92,31 @@ msgstr "Ingen URI givet"
msgid "Invalid “%s” URI: %s"
msgstr "Ugyldig “%s”-URI: %s"
#: libsoup/soup-server.c:1797
#: libsoup/soup-server.c:1810
msgid "Can’t create a TLS server without a TLS certificate"
msgstr "Kan ikke oprette en TLS-server uden et TLS-certifikat"
#: libsoup/soup-server.c:1814
#: libsoup/soup-server.c:1827
#, c-format
msgid "Could not listen on address %s, port %d: "
msgstr "Kunne ikke lytte på adresse %s, port %d: "
#: libsoup/soup-session.c:4535
#: libsoup/soup-session.c:4587
#, c-format
msgid "Could not parse URI “%s”"
msgstr "Kunne ikke fortolke URI “%s”"
#: libsoup/soup-session.c:4572
#: libsoup/soup-session.c:4624
#, c-format
msgid "Unsupported URI scheme “%s”"
msgstr "Uunderstøttet URI-skema “%s”"
#: libsoup/soup-session.c:4594
#: libsoup/soup-session.c:4646
#, c-format
msgid "Not an HTTP URI"
msgstr "Ikke en HTTP URI"
#: libsoup/soup-session.c:4805
#: libsoup/soup-session.c:4857
msgid "The server did not accept the WebSocket handshake."
msgstr "Serveren accepterede ikke WebSocket-håndtrykket."
......@@ -143,7 +156,9 @@ msgstr "Duplikeret parameter i WebSocket-udvidelsesheaderen “%s”"
#, c-format
msgid ""
"Server returned a duplicated parameter in “%s” WebSocket extension header"
msgstr "Server returnerede en duplikeret parameter i WebSocket-udvidelsesheaderen “%s”"
msgstr ""
"Server returnerede en duplikeret parameter i WebSocket-udvidelsesheaderen "
"“%s”"
#: libsoup/soup-websocket.c:658 libsoup/soup-websocket.c:667
msgid "WebSocket handshake expected"
......
po/ru.po
View file @ 3ed0d718
......@@ -8,11 +8,10 @@
msgid ""
msgstr ""
"Project-Id-Version: libsoup master\n"
"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
"product=libsoup&keywords=I18N+L10N&component=Misc\n"
"POT-Creation-Date: 2017-02-23 10:17+0000\n"
"PO-Revision-Date: 2017-03-17 19:33+0400\n"
"Last-Translator: Yuri Myasoedov <ymyasoedov@yandex.ru>\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libsoup/issues\n"
"POT-Creation-Date: 2021-09-13 23:29+0000\n"
"PO-Revision-Date: 2021-09-18 09:50+0300\n"
"Last-Translator: Alexey Rubtsov <rushills@gmail.com>\n"
"Language-Team: Русский <gnome-cyr@gnome.org>\n"
"Language: ru\n"
"MIME-Version: 1.0\n"
......@@ -20,160 +19,192 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Poedit 1.8.7.1\n"
"X-Generator: Poedit 3.0\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/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:244
msgid "Connection terminated unexpectedly"
msgstr "Соединение было неожиданно разорвано"
#: ../libsoup/soup-body-input-stream.c:459
#: libsoup/soup-body-input-stream.c:459
msgid "Invalid seek request"
msgstr "Неверный запрос поиска"
#: ../libsoup/soup-body-input-stream.c:487
#: libsoup/soup-body-input-stream.c:487
msgid "Cannot truncate SoupBodyInputStream"
msgstr "Не удалось отсечь SoupBodyInputStream"
#: ../libsoup/soup-cache-input-stream.c:76
#: libsoup/soup-cache-input-stream.c:76
msgid "Network stream unexpectedly closed"
msgstr "Сетевой поток неожиданно закрылся"
#: ../libsoup/soup-cache-input-stream.c:291
#: libsoup/soup-cache-input-stream.c:291
msgid "Failed to completely cache the resource"
msgstr "Не удалось полностью закэшировать ресурс"
#: ../libsoup/soup-converter-wrapper.c:189
#: libsoup/soup-directory-input-stream.c:232
msgid "Name"
msgstr "Имя"
#: libsoup/soup-directory-input-stream.c:233
msgid "Size"
msgstr "Размер"
#: libsoup/soup-directory-input-stream.c:234
msgid "Date Modified"
msgstr "Дата изменения"
#: libsoup/soup-converter-wrapper.c:189
#, c-format
msgid "Output buffer is too small"
msgstr "Слишком маленький буфер вывода"
#: ../libsoup/soup-message-client-io.c:41
#: libsoup/soup-message-client-io.c:39
msgid "Could not parse HTTP response"
msgstr "Не удалось разобрать HTTP-ответ"
#: ../libsoup/soup-message-client-io.c:66
#: libsoup/soup-message-client-io.c:62
msgid "Unrecognized HTTP response encoding"
msgstr "Нераспознанная кодировка HTTP-ответа"
#: ../libsoup/soup-message-io.c:392 ../libsoup/soup-message-io.c:1020
#: libsoup/soup-message-io.c:269
msgid "Header too big"
msgstr "Слишком большой заголовок"
#: libsoup/soup-message-io.c:401 libsoup/soup-message-io.c:1024
msgid "Operation would block"
msgstr "Действие заблокировано"
#: ../libsoup/soup-message-io.c:972 ../libsoup/soup-message-io.c:1005
#: libsoup/soup-message-io.c:976 libsoup/soup-message-io.c:1009
msgid "Operation was cancelled"
msgstr "Действие отменено"
#: ../libsoup/soup-message-server-io.c:64
#: libsoup/soup-message-server-io.c:63
msgid "Could not parse HTTP request"
msgstr "Не удалось разобрать HTTP-запрос"
#: ../libsoup/soup-request.c:141
#: libsoup/soup-request.c:141
#, c-format
msgid "No URI provided"
msgstr "Не указан URI"
#: ../libsoup/soup-request.c:151
#: libsoup/soup-request.c:151
#, c-format
msgid "Invalid “%s” URI: %s"
msgstr "Недопустимый URI «%s»: %s"
#: ../libsoup/soup-server.c:1725
#: libsoup/soup-server.c:1810
msgid "Can’t create a TLS server without a TLS certificate"
msgstr "Невозможно создать TLS-сервер без TLS-сертификата"
#: ../libsoup/soup-server.c:1742
#: libsoup/soup-server.c:1827
#, c-format
msgid "Could not listen on address %s, port %d: "
msgstr "Не удалось начать прослушивание по адресу %s (порт — %d): "
#: ../libsoup/soup-session.c:4518
#: libsoup/soup-session.c:4587
#, c-format
msgid "Could not parse URI “%s”"
msgstr "Не удалось разобрать URI «%s»"
#: ../libsoup/soup-session.c:4555
#: libsoup/soup-session.c:4624
#, c-format
msgid "Unsupported URI scheme “%s”"
msgstr "Неподдерживаемая схема URI «%s»"
#: ../libsoup/soup-session.c:4577
#: libsoup/soup-session.c:4646
#, c-format
msgid "Not an HTTP URI"
msgstr "Формат URI отличается от HTTP"
#: ../libsoup/soup-session.c:4763
#: libsoup/soup-session.c:4857
msgid "The server did not accept the WebSocket handshake."
msgstr "Сервер не принимает подтверждение связи WebSocket."
#: ../libsoup/soup-socket.c:148
#: libsoup/soup-socket.c:148
msgid "Can’t import non-socket as SoupSocket"
msgstr ""
"Невозможно импортировать объект, отличный от сокета, в качестве SoupSocket"
#: ../libsoup/soup-socket.c:166
#: libsoup/soup-socket.c:166
msgid "Could not import existing socket: "
msgstr "Не удалось импортировать существующий сокет: "
#: ../libsoup/soup-socket.c:175
#: libsoup/soup-socket.c:175
msgid "Can’t import unconnected socket"
msgstr "Невозможно импортировать неподключенный сокет"
#: ../libsoup/soup-websocket.c:338 ../libsoup/soup-websocket.c:347
#: libsoup/soup-websocket.c:479 libsoup/soup-websocket.c:523
#: libsoup/soup-websocket.c:539
msgid "Server requested unsupported extension"
msgstr "Сервер запросил неподдерживаемое расширение"
#: libsoup/soup-websocket.c:502 libsoup/soup-websocket.c:694
#, c-format
msgid "Incorrect WebSocket “%s” header"
msgstr "Неправильный заголовок WebSocket «%s»"
#: libsoup/soup-websocket.c:503 libsoup/soup-websocket.c:1024
#, c-format
msgid "Server returned incorrect “%s” key"
msgstr "Сервер вернул неправильный ключ «%s»"
#: libsoup/soup-websocket.c:566
#, c-format
msgid "Duplicated parameter in “%s” WebSocket extension header"
msgstr "Повторяющийся параметр «%s» в заголовке расширения Websocket"
#: libsoup/soup-websocket.c:567
#, c-format
msgid ""
"Server returned a duplicated parameter in “%s” WebSocket extension header"
msgstr ""
"Сервер вернул повторяющийся параметр в заголовке расширения WebSocket «%s»"
#: libsoup/soup-websocket.c:658 libsoup/soup-websocket.c:667
msgid "WebSocket handshake expected"
msgstr "Ожидается подтверждение связи WebSocket"
#: ../libsoup/soup-websocket.c:355
#: libsoup/soup-websocket.c:675
msgid "Unsupported WebSocket version"
msgstr "Неподдерживаемая версия WebSocket"
#: ../libsoup/soup-websocket.c:364
#: libsoup/soup-websocket.c:684
msgid "Invalid WebSocket key"
msgstr "Неверный ключ WebSocket"
#: ../libsoup/soup-websocket.c:374
#, c-format
msgid "Incorrect WebSocket “%s” header"
msgstr "Неправильный заголовок WebSocket «%s»"
#: ../libsoup/soup-websocket.c:383
#: libsoup/soup-websocket.c:703
msgid "Unsupported WebSocket subprotocol"
msgstr "Неподдерживаемый подпротокол WebSocket"
#: ../libsoup/soup-websocket.c:510
#: libsoup/soup-websocket.c:975
msgid "Server rejected WebSocket handshake"
msgstr "Сервер отклонил подтверждение связи WebSocket"
#: ../libsoup/soup-websocket.c:518 ../libsoup/soup-websocket.c:527
#: libsoup/soup-websocket.c:983 libsoup/soup-websocket.c:992
msgid "Server ignored WebSocket handshake"
msgstr "Сервер проигнорировал подтверждение связи WebSocket"
#: ../libsoup/soup-websocket.c:539
#: libsoup/soup-websocket.c:1004
msgid "Server requested unsupported protocol"
msgstr "Сервер запросил неподдерживаемый протокол"
#: ../libsoup/soup-websocket.c:549
msgid "Server requested unsupported extension"
msgstr "Сервер запросил неподдерживаемое расширение"
#: libsoup/soup-tld.c:150
msgid "No public-suffix list available."
msgstr "Публичные суффиксы не доступны."
#: ../libsoup/soup-websocket.c:562
#, c-format
msgid "Server returned incorrect “%s” key"
msgstr "Сервер вернул неправильный ключ «%s»"
#: libsoup/soup-tld.c:160 libsoup/soup-tld.c:176
msgid "Invalid hostname"
msgstr "Неверное имя компьютера"
#: ../libsoup/soup-tld.c:188
#: libsoup/soup-tld.c:167
msgid "Hostname is an IP address"
msgstr "Имя компьютера является IP-адресом"
#: ../libsoup/soup-tld.c:198 ../libsoup/soup-tld.c:220
msgid "Invalid hostname"
msgstr "Неверное имя компьютера"
#: ../libsoup/soup-tld.c:250
#: libsoup/soup-tld.c:188
msgid "Hostname has no base domain"
msgstr "Имя компьютера не содержит доменной части"
#: ../libsoup/soup-tld.c:304
#: libsoup/soup-tld.c:196
msgid "Not enough domains"
msgstr "Недостаточно доменных имён в адресе"