[glib: 7/7] Merge branch 'wip/tingping/happy-eyeballs'
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib: 7/7] Merge branch 'wip/tingping/happy-eyeballs'
- Date: Wed, 12 Dec 2018 23:09:59 +0000 (UTC)
commit 99d7894d48ffe4dc3236fc2bf5d8c8b028353707
Merge: af39a3731 4c472f8e3
Author: Michael Catanzaro <mcatanzaro igalia com>
Date: Wed Dec 12 17:08:58 2018 -0600
Merge branch 'wip/tingping/happy-eyeballs'
Merging this manually because the CI is broken.
Fixes https://gitlab.gnome.org/GNOME/glib/merge_requests/421
docs/reference/gio/gio-sections.txt | 4 +
gio/gnetworkaddress.c | 366 ++++++++++++++++++++++++++++++-----
gio/gresolver.c | 314 +++++++++++++++++++++++-------
gio/gresolver.h | 332 ++++++++++++++++++++------------
gio/gsocketaddressenumerator.c | 4 +-
gio/gsocketclient.c | 176 ++++++++++++++---
gio/gthreadedresolver.c | 156 ++++++++++++---
gio/tests/Makefile.am | 7 +-
gio/tests/gsocketclient-slow.c | 74 ++++++++
gio/tests/meson.build | 23 ++-
gio/tests/mock-resolver.c | 169 +++++++++++++++++
gio/tests/mock-resolver.h | 35 ++++
gio/tests/network-address.c | 368 +++++++++++++++++++++++++++++++++++-
gio/tests/proxy-test.c | 24 ++-
gio/tests/slow-connect-preload.c | 43 +++++
15 files changed, 1791 insertions(+), 304 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]