netsurf: branch master updated. release/3.0-1172-g9c60417
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/9c60417f73868e2cd8e0d...
...commit http://git.netsurf-browser.org/netsurf.git/commit/9c60417f73868e2cd8e0db9...
...tree http://git.netsurf-browser.org/netsurf.git/tree/9c60417f73868e2cd8e0db951...
The branch, master has been updated
via 9c60417f73868e2cd8e0db951020110ee8c295fc (commit)
from 0adbfe125e288c59588be87f7cd8493b0c8c0351 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=9c60417f73868e2cd8e...
commit 9c60417f73868e2cd8e0db951020110ee8c295fc
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Simplify DOM node walker.
diff --git a/utils/libdom.c b/utils/libdom.c
index a1465af..245c9b2 100644
--- a/utils/libdom.c
+++ b/utils/libdom.c
@@ -50,58 +50,42 @@ bool libdom_treewalk(dom_node *root,
break;
}
- if (next != NULL) { /* 1. children */
+ if (next != NULL) {
+ /* 1. Got children */
dom_node_unref(node);
node = next;
} else {
- exc = dom_node_get_next_sibling(node, &next);
- if (exc != DOM_NO_ERR) {
- dom_node_unref(node);
- break;
- }
-
- if (next != NULL) { /* 2. siblings */
- dom_node_unref(node);
- node = next;
- } else { /* 3. ancestor siblings */
- while (node != NULL) {
- exc = dom_node_get_next_sibling(node,
- &next);
- if (exc != DOM_NO_ERR) {
- dom_node_unref(node);
- node = NULL;
- break;
- }
-
- if (next != NULL) {
- dom_node_unref(next);
- break;
- }
-
- exc = dom_node_get_parent_node(node,
- &next);
- if (exc != DOM_NO_ERR) {
- dom_node_unref(node);
- node = NULL;
- break;
- }
-
+ /* No children; siblings & ancestor's siblings */
+ while (node != NULL) {
+ exc = dom_node_get_next_sibling(node, &next);
+ if (exc != DOM_NO_ERR) {
dom_node_unref(node);
- node = next;
+ node = NULL;
+ break;
}
- if (node == NULL)
+ if (next != NULL) {
+ /* 2. Got sibling */
break;
+ }
- exc = dom_node_get_next_sibling(node, &next);
+ exc = dom_node_get_parent_node(node, &next);
if (exc != DOM_NO_ERR) {
dom_node_unref(node);
+ node = NULL;
break;
}
+ /* 3. Try parent */
dom_node_unref(node);
node = next;
}
+
+ if (node == NULL)
+ break;
+
+ dom_node_unref(node);
+ node = next;
}
assert(node != NULL);
-----------------------------------------------------------------------
Summary of changes:
utils/libdom.c | 56 ++++++++++++++++++++------------------------------------
1 files changed, 20 insertions(+), 36 deletions(-)
diff --git a/utils/libdom.c b/utils/libdom.c
index a1465af..245c9b2 100644
--- a/utils/libdom.c
+++ b/utils/libdom.c
@@ -50,58 +50,42 @@ bool libdom_treewalk(dom_node *root,
break;
}
- if (next != NULL) { /* 1. children */
+ if (next != NULL) {
+ /* 1. Got children */
dom_node_unref(node);
node = next;
} else {
- exc = dom_node_get_next_sibling(node, &next);
- if (exc != DOM_NO_ERR) {
- dom_node_unref(node);
- break;
- }
-
- if (next != NULL) { /* 2. siblings */
- dom_node_unref(node);
- node = next;
- } else { /* 3. ancestor siblings */
- while (node != NULL) {
- exc = dom_node_get_next_sibling(node,
- &next);
- if (exc != DOM_NO_ERR) {
- dom_node_unref(node);
- node = NULL;
- break;
- }
-
- if (next != NULL) {
- dom_node_unref(next);
- break;
- }
-
- exc = dom_node_get_parent_node(node,
- &next);
- if (exc != DOM_NO_ERR) {
- dom_node_unref(node);
- node = NULL;
- break;
- }
-
+ /* No children; siblings & ancestor's siblings */
+ while (node != NULL) {
+ exc = dom_node_get_next_sibling(node, &next);
+ if (exc != DOM_NO_ERR) {
dom_node_unref(node);
- node = next;
+ node = NULL;
+ break;
}
- if (node == NULL)
+ if (next != NULL) {
+ /* 2. Got sibling */
break;
+ }
- exc = dom_node_get_next_sibling(node, &next);
+ exc = dom_node_get_parent_node(node, &next);
if (exc != DOM_NO_ERR) {
dom_node_unref(node);
+ node = NULL;
break;
}
+ /* 3. Try parent */
dom_node_unref(node);
node = next;
}
+
+ if (node == NULL)
+ break;
+
+ dom_node_unref(node);
+ node = next;
}
assert(node != NULL);
--
NetSurf Browser
9 years, 8 months
- 1
- 0
netsurf: branch master updated. release/3.0-1171-g0adbfe1
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/0adbfe125e288c59588be...
...commit http://git.netsurf-browser.org/netsurf.git/commit/0adbfe125e288c59588be87...
...tree http://git.netsurf-browser.org/netsurf.git/tree/0adbfe125e288c59588be87f7...
The branch, master has been updated
via 0adbfe125e288c59588be87f7cd8493b0c8c0351 (commit)
from 97c12b975c163aa878736fe66d1968f0dc5af7eb (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=0adbfe125e288c59588...
commit 0adbfe125e288c59588be87f7cd8493b0c8c0351
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Update for 3.1 release
diff --git a/Docs/BUILDING-AmigaOS b/Docs/BUILDING-AmigaOS
index c15db57..3239e88 100644
--- a/Docs/BUILDING-AmigaOS
+++ b/Docs/BUILDING-AmigaOS
@@ -1,5 +1,5 @@
--------------------------------------------------------------------------------
- Build Instructions for AmigaOS NetSurf 13 February 2010
+ Build Instructions for AmigaOS NetSurf 29 March 2014
--------------------------------------------------------------------------------
This document provides instructions for building the AmigaOS version of
@@ -59,19 +59,9 @@
To build and install these libraries, simply enter each of their directories
and run:
- 1> gmake install
+ 1> gmake PREFIX=/path/to/buildsystem
- | Note: We advise enabling iconv() support in libparserutils, which vastly
- | increases the number of supported character sets. To do this,
- | create a file called Makefile.config.override in the libparserutils
- | directory, containing the following lines:
- |
- | CFLAGS += -DWITH_ICONV_FILTER
- | LDFLAGS += -liconv
- |
- | This requires libiconv as iconv support in newlib.library is buggy.
- |
- | For more information, consult the libparserutils README file.
+ The path MUST be in UNIX format and point to directory containing "share".
| Note: Building libsvgtiny requires gperf, which is available from Aminet:
|
@@ -83,21 +73,23 @@
A version of libcurl built for newlib is available from Aminet
- http://www.aminet.net/package/dev/lib/libcurl
+ http://www.os4depot.net/share/development/library/misc/libcurl.lha
- There is a shared object version included with some OWB releases. To use
- this when compiling with Cairo support, a link must be made:
+ To use the shared object when compiling with Cairo support, a link must be made:
- 1> makelink sdk:local/newlib/lib/libcurl.so sobjs:libcurl-7.16.so soft
+ 1> makelink sdk:local/newlib/lib/libcurl.so sobjs:libcurl.so.8 soft
libpng
--------
NetSurf uses libPNG to display PNG files.
- It builds without any problems on OS4, or available from Aminet:
+ It builds without any problems on OS4, or available from OS4Depot:
- http://www.aminet.net/package/dev/lib/libpng_so
+ http://www.os4depot.net/share/development/library/graphics/libpng.lha
+
+ If building with Cairo, NetSurf MUST be linked against the version of
+ libpng.so included with OS4.
OpenSSL
@@ -107,11 +99,10 @@
http://www.os4depot.net/share/development/library/misc/libopenssl.lha
- There is a shared object version included with some OWB releases. To use
- this when compiling with Cairo support, a link must be made:
+ To use the shared object when compiling with Cairo support, a link must be made:
- 1> makelink sdk:local/newlib/lib/libssl.so sobjs:libssl-0.9.8.so soft
- 1> makelink sdk:local/newlib/lib/libcrypto.so sobjs:libssl-0.9.8.so soft
+ 1> makelink sdk:local/newlib/lib/libssl.so sobjs:libssl.so.1.0.0 soft
+ 1> makelink sdk:local/newlib/lib/libcrypto.so sobjs:libcrypto.so.1.0.0 soft
Libharu
@@ -141,19 +132,18 @@
http://www.aminet.net/package/comm/www/OpenURL-OS4
- General requirements
-----------------------
+ Spidermonkey
+--------------
- SDK:newlib/include/strings.h needs to be modified by adding the following:
+ Experimental Javascript support requires Spidermonkey. The patches to
+ build v1.7 are available from the NetSurf toolchains Git repository.
- extern int strcasecmp(const char *, const char *);
- extern int strncasecmp(const char *, const char *, size_t);
- amiga/version.c is generated by version.rexx using the SVN command. If
- the source has not been checked out from SVN, or is being cross-compiled,
- this file will need to be created by hand. See the end of version.rexx
- for the variables that are defined in the file.
+ General requirements
+----------------------
Please note that building with Cairo (option NETSURF_AMIGA_USE_CAIRO) will
link NetSurf against shared objects, and require the OS4.1 SDK to build and
- AmigaOS 4.1 to run.
+ AmigaOS 4.1 to run. There is no longer any advantage in building against
+ Cairo beyond anti-aliasing, and this option may be removed in the future.
+
-----------------------------------------------------------------------
Summary of changes:
Docs/BUILDING-AmigaOS | 56 ++++++++++++++++++++----------------------------
1 files changed, 23 insertions(+), 33 deletions(-)
diff --git a/Docs/BUILDING-AmigaOS b/Docs/BUILDING-AmigaOS
index c15db57..3239e88 100644
--- a/Docs/BUILDING-AmigaOS
+++ b/Docs/BUILDING-AmigaOS
@@ -1,5 +1,5 @@
--------------------------------------------------------------------------------
- Build Instructions for AmigaOS NetSurf 13 February 2010
+ Build Instructions for AmigaOS NetSurf 29 March 2014
--------------------------------------------------------------------------------
This document provides instructions for building the AmigaOS version of
@@ -59,19 +59,9 @@
To build and install these libraries, simply enter each of their directories
and run:
- 1> gmake install
+ 1> gmake PREFIX=/path/to/buildsystem
- | Note: We advise enabling iconv() support in libparserutils, which vastly
- | increases the number of supported character sets. To do this,
- | create a file called Makefile.config.override in the libparserutils
- | directory, containing the following lines:
- |
- | CFLAGS += -DWITH_ICONV_FILTER
- | LDFLAGS += -liconv
- |
- | This requires libiconv as iconv support in newlib.library is buggy.
- |
- | For more information, consult the libparserutils README file.
+ The path MUST be in UNIX format and point to directory containing "share".
| Note: Building libsvgtiny requires gperf, which is available from Aminet:
|
@@ -83,21 +73,23 @@
A version of libcurl built for newlib is available from Aminet
- http://www.aminet.net/package/dev/lib/libcurl
+ http://www.os4depot.net/share/development/library/misc/libcurl.lha
- There is a shared object version included with some OWB releases. To use
- this when compiling with Cairo support, a link must be made:
+ To use the shared object when compiling with Cairo support, a link must be made:
- 1> makelink sdk:local/newlib/lib/libcurl.so sobjs:libcurl-7.16.so soft
+ 1> makelink sdk:local/newlib/lib/libcurl.so sobjs:libcurl.so.8 soft
libpng
--------
NetSurf uses libPNG to display PNG files.
- It builds without any problems on OS4, or available from Aminet:
+ It builds without any problems on OS4, or available from OS4Depot:
- http://www.aminet.net/package/dev/lib/libpng_so
+ http://www.os4depot.net/share/development/library/graphics/libpng.lha
+
+ If building with Cairo, NetSurf MUST be linked against the version of
+ libpng.so included with OS4.
OpenSSL
@@ -107,11 +99,10 @@
http://www.os4depot.net/share/development/library/misc/libopenssl.lha
- There is a shared object version included with some OWB releases. To use
- this when compiling with Cairo support, a link must be made:
+ To use the shared object when compiling with Cairo support, a link must be made:
- 1> makelink sdk:local/newlib/lib/libssl.so sobjs:libssl-0.9.8.so soft
- 1> makelink sdk:local/newlib/lib/libcrypto.so sobjs:libssl-0.9.8.so soft
+ 1> makelink sdk:local/newlib/lib/libssl.so sobjs:libssl.so.1.0.0 soft
+ 1> makelink sdk:local/newlib/lib/libcrypto.so sobjs:libcrypto.so.1.0.0 soft
Libharu
@@ -141,19 +132,18 @@
http://www.aminet.net/package/comm/www/OpenURL-OS4
- General requirements
-----------------------
+ Spidermonkey
+--------------
- SDK:newlib/include/strings.h needs to be modified by adding the following:
+ Experimental Javascript support requires Spidermonkey. The patches to
+ build v1.7 are available from the NetSurf toolchains Git repository.
- extern int strcasecmp(const char *, const char *);
- extern int strncasecmp(const char *, const char *, size_t);
- amiga/version.c is generated by version.rexx using the SVN command. If
- the source has not been checked out from SVN, or is being cross-compiled,
- this file will need to be created by hand. See the end of version.rexx
- for the variables that are defined in the file.
+ General requirements
+----------------------
Please note that building with Cairo (option NETSURF_AMIGA_USE_CAIRO) will
link NetSurf against shared objects, and require the OS4.1 SDK to build and
- AmigaOS 4.1 to run.
+ AmigaOS 4.1 to run. There is no longer any advantage in building against
+ Cairo beyond anti-aliasing, and this option may be removed in the future.
+
--
NetSurf Browser
9 years, 8 months
- 1
- 0
toolchains: branch master updated. 38990d5563d30a180741ff6fef2c4a8aa9341bb2
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/toolchains.git/shortlog/38990d5563d30a1807...
...commit http://git.netsurf-browser.org/toolchains.git/commit/38990d5563d30a180741...
...tree http://git.netsurf-browser.org/toolchains.git/tree/38990d5563d30a180741ff...
The branch, master has been updated
via 38990d5563d30a180741ff6fef2c4a8aa9341bb2 (commit)
from 4a8c6c7a6286b3daeb84df76172d131101b0d830 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/toolchains.git/commit/?id=38990d5563d30a18...
commit 38990d5563d30a180741ff6fef2c4a8aa9341bb2
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Update libpng to 1.6.10.
diff --git a/sdk/Makefile b/sdk/Makefile
index cff1247..fe0cc92 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -27,7 +27,7 @@ VERSION_ZLIB := 1.2.8
VERSION_LIBICONV := 1.14
VERSION_LIBTRE := 0.8.0
VERSION_OPENSSL := 1.0.1f
-VERSION_LIBPNG := 1.6.8
+VERSION_LIBPNG := 1.6.10
VERSION_LIBJPEG := 8d
VERSION_LIBCARES := 1.10.0
VERSION_LIBCURL := 7.34.0
-----------------------------------------------------------------------
Summary of changes:
sdk/Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/sdk/Makefile b/sdk/Makefile
index cff1247..fe0cc92 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -27,7 +27,7 @@ VERSION_ZLIB := 1.2.8
VERSION_LIBICONV := 1.14
VERSION_LIBTRE := 0.8.0
VERSION_OPENSSL := 1.0.1f
-VERSION_LIBPNG := 1.6.8
+VERSION_LIBPNG := 1.6.10
VERSION_LIBJPEG := 8d
VERSION_LIBCARES := 1.10.0
VERSION_LIBCURL := 7.34.0
--
Cross-compilation toolchains and environments
9 years, 8 months
- 1
- 0
toolchains: branch chris/http2 created. 4ec8789667fb63e8bee5b89d73d8a291df0ec0b1
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/toolchains.git/shortlog/4ec8789667fb63e8be...
...commit http://git.netsurf-browser.org/toolchains.git/commit/4ec8789667fb63e8bee5...
...tree http://git.netsurf-browser.org/toolchains.git/tree/4ec8789667fb63e8bee5b8...
The branch, chris/http2 has been created
at 4ec8789667fb63e8bee5b89d73d8a291df0ec0b1 (commit)
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/toolchains.git/commit/?id=4ec8789667fb63e8...
commit 4ec8789667fb63e8bee5b89d73d8a291df0ec0b1
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Add nghttp2 and update to libcurl 7.36 for HTTP 2.0 support
diff --git a/sdk/Makefile b/sdk/Makefile
index cff1247..7e3471e 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -30,7 +30,8 @@ VERSION_OPENSSL := 1.0.1f
VERSION_LIBPNG := 1.6.8
VERSION_LIBJPEG := 8d
VERSION_LIBCARES := 1.10.0
-VERSION_LIBCURL := 7.34.0
+VERSION_LIBCURL := 7.36.0
+VERSION_NGHTTP2 := 0.3.2
VERSION_LIBGNURX := 2.5.1
VERSION_LIBPBL := 1_04
VERSION_LIBCF := CVS-20130415
@@ -79,7 +80,7 @@ FETCHSRC := $(CURDIR)/fetchsrc
# Compute the SDK components
SDK_ITEMS :=
-COMMON_SDK_ITEMS := zlib.d openssl.d libpng.d libjpeg.d libcares.d libcurl.d libexpat.d
+COMMON_SDK_ITEMS := zlib.d openssl.d libpng.d libjpeg.d libcares.d nghttp2.d libcurl.d libexpat.d
LIBCURL_DISABLES := $(patsubst %,--disable-%,ftp file dict ldap ldaps rtsp telnet gopher tftp pop3 imap smtp manual)
FREETYPE_ENV := LIBPNG_CFLAGS=$$($(GCCSDK_INSTALL_ENV)/bin/libpng-config --cflags) LIBPNG_LDFLAGS=$$($(GCCSDK_INSTALL_ENV)/bin/libpng-config --ldflags)
@@ -394,8 +395,8 @@ $(SOURCEDIR)/c-ares-$(VERSION_LIBCARES).tar.gz:
# libcurl
-$(BUILDSTEPS)/libcurl.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib.d $(BUILDSTEPS)/openssl.d $(BUILDSTEPS)/libcares.d $(BUILDSTEPS)/libcurl-src.d
- cd $(BUILDDIR)/libcurl/curl-$(VERSION_LIBCURL) && $(env) CFLAGS="" ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared --without-libidn ${EXTRAARGS_LIBCURL}
+$(BUILDSTEPS)/libcurl.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib.d $(BUILDSTEPS)/openssl.d $(BUILDSTEPS)/libcares.d $(BUILDSTEPS)/nghttp2.d $(BUILDSTEPS)/libcurl-src.d
+ cd $(BUILDDIR)/libcurl/curl-$(VERSION_LIBCURL) && $(env) CFLAGS="" ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared --without-libidn --with-nghttp2 ${EXTRAARGS_LIBCURL}
cd $(BUILDDIR)/libcurl/curl-$(VERSION_LIBCURL) && $(env) make install
touch $@
@@ -426,6 +427,24 @@ $(BUILDSTEPS)/libexpat-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/expat-$(VER
$(SOURCEDIR)/expat-$(VERSION_LIBEXPAT).tar.gz:
$(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "http://downloads.sourceforge.net/project/expat/expat/$(VERSION_LIBEXPAT)/..." $@
+# nghttp2
+$(BUILDSTEPS)/nghttp2.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/nghttp2-src.d
+ mkdir -p $(BUILDDIR)/nghttp2
+ cd $(BUILDDIR)/nghttp2 && tar xaf $(SOURCEDIR)/nghttp2-$(VERSION_NGHTTP2).tar.gz
+ for p in `ls $(RECIPES)/patches/nghttp2/*.p` ; do $(PATCH) -d $(BUILDDIR)/nghttp2/nghttp2-$(VERSION_NGHTTP2) -p0 <$$p ; done
+ifneq ($(realpath $(RECIPES)/patches/nghttp2/$(TARGET)),)
+ for p in `ls $(RECIPES)/patches/nghttp2/$(TARGET)/*.p` ; do $(PATCH) -d $(BUILDDIR)/nghttp2/nghttp2-$(VERSION_NGHTTP2) -p0 <$$p ; done
+endif
+ cd $(BUILDDIR)/nghttp2/nghttp2-$(VERSION_NGHTTP2) && $(env) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared $(EXTRAARGS_NGHTTP2)
+ cd $(BUILDDIR)/nghttp2/nghttp2-$(VERSION_NGHTTP2) && $(env) make install
+ touch $@
+
+$(BUILDSTEPS)/nghttp2-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/nghttp2-$(VERSION_NGHTTP2).tar.gz
+ touch $@
+
+$(SOURCEDIR)/nghttp2-$(VERSION_NGHTTP2).tar.gz:
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "https://github.com/tatsuhiro-t/nghttp2/releases/download/v0.3.2/$(subst $(SOURCEDIR)/,,$@)" $@
+
# nspr
$(BUILDSTEPS)/nspr.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/nspr-src.d
diff --git a/sdk/recipes/patches/libcurl/7.34.0-ipv6-trynextip.p b/sdk/recipes/patches/libcurl/7.34.0-ipv6-trynextip.p
deleted file mode 100644
index 7135203..0000000
--- a/sdk/recipes/patches/libcurl/7.34.0-ipv6-trynextip.p
+++ /dev/null
@@ -1,27 +0,0 @@
-Origin: https://github.com/bagder/curl/commit/2d435c7fb5b7691e8ca1f3052e1eb5bcd8a...
-
-diff --git a/lib/connect.c b/lib/connect.c
-index 33f7aec..05666eb 100644
---- lib/connect.c
-+++ lib/connect.c
-@@ -5,7 +5,7 @@
- * | (__| |_| | _ <| |___
- * \___|\___/|_| \_\_____|
- *
-- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel(a)haxx.se>, et al.
-+ * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel(a)haxx.se>, et al.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution. The terms
-@@ -556,7 +556,11 @@ static CURLcode trynextip(struct connectdata *conn,
- else {
- /* happy eyeballs - try the other protocol family */
- int firstfamily = conn->tempaddr[0]->ai_family;
-+#ifdef ENABLE_IPV6
- family = (firstfamily == AF_INET) ? AF_INET6 : AF_INET;
-+#else
-+ family = firstfamily;
-+#endif
- ai = conn->tempaddr[0]->ai_next;
- }
-
-----------------------------------------------------------------------
--
Cross-compilation toolchains and environments
9 years, 8 months
- 1
- 0
netsurf: branch chris/http2 created. release/3.0-1171-gbf8c0e8
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/bf8c0e8b256f245409b50...
...commit http://git.netsurf-browser.org/netsurf.git/commit/bf8c0e8b256f245409b50a4...
...tree http://git.netsurf-browser.org/netsurf.git/tree/bf8c0e8b256f245409b50a45c...
The branch, chris/http2 has been created
at bf8c0e8b256f245409b50a45c4fe765ff6dad03a (commit)
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=bf8c0e8b256f245409b...
commit bf8c0e8b256f245409b50a45c4fe765ff6dad03a
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Allow NetSurf to use HTTP 2.0 if libcurl is new enough (7.36.0)
NB: Choices option "enable_http2" must be set to enable this.
diff --git a/content/fetchers/curl.c b/content/fetchers/curl.c
index 612b77d..1b77b30 100644
--- a/content/fetchers/curl.c
+++ b/content/fetchers/curl.c
@@ -223,6 +223,13 @@ void fetch_curl_register(void)
SETOPT(CURLOPT_LOW_SPEED_TIME, 180L);
SETOPT(CURLOPT_NOSIGNAL, 1L);
SETOPT(CURLOPT_CONNECTTIMEOUT, 30L);
+#if LIBCURL_VERSION_NUM >= 0x072400
+ /* We've been built against libcurl 7.36.0 or later: enable HTTP 2.0 */
+ if (nsoption_bool(enable_http2)) {
+ LOG(("Enabling HTTP 2.0"));
+ SETOPT(CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2_0);
+ }
+#endif
if (nsoption_charp(ca_bundle) &&
strcmp(nsoption_charp(ca_bundle), "")) {
diff --git a/desktop/options.h b/desktop/options.h
index 391dfbc..7f5a254 100644
--- a/desktop/options.h
+++ b/desktop/options.h
@@ -208,6 +208,9 @@ NSOPTION_INTEGER(max_cached_fetch_handles, 6)
/** Suppress debug output from cURL. */
NSOPTION_BOOL(suppress_curl_debug, true)
+/** Allow cURL to use HTTP 2.0 */
+NSOPTION_BOOL(enable_http2, false)
+
/** Whether to allow target="_blank" */
NSOPTION_BOOL(target_blank, true)
-----------------------------------------------------------------------
--
NetSurf Browser
9 years, 8 months
- 1
- 0
libparserutils: branch master updated. release/0.1.2-9-g3b3385c
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/libparserutils.git/shortlog/3b3385ca09c9ca...
...commit http://git.netsurf-browser.org/libparserutils.git/commit/3b3385ca09c9cab4...
...tree http://git.netsurf-browser.org/libparserutils.git/tree/3b3385ca09c9cab412...
The branch, master has been updated
via 3b3385ca09c9cab412dd9213f7f018309b438140 (commit)
via 5f7fe78d1119fd068e8c932bb0ea321b31088787 (commit)
from 93c721d6edc90e6f06eff8701824aa0d9ed6da16 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/libparserutils.git/commit/?id=3b3385ca09c9...
commit 3b3385ca09c9cab412dd9213f7f018309b438140
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Fix memmove beyond buffer length in parserutlis_buffer_discard. Thanks to Elie Roudninski.
diff --git a/src/utils/buffer.c b/src/utils/buffer.c
index 5a2a7ce..716e67c 100644
--- a/src/utils/buffer.c
+++ b/src/utils/buffer.c
@@ -134,7 +134,7 @@ parserutils_error parserutils_buffer_discard(parserutils_buffer *buffer,
return PARSERUTILS_BADPARM;
memmove(buffer->data + offset, buffer->data + offset + len,
- buffer->length - len);
+ buffer->length - (len + offset));
buffer->length -= len;
commitdiff http://git.netsurf-browser.org/libparserutils.git/commit/?id=5f7fe78d1119...
commit 5f7fe78d1119fd068e8c932bb0ea321b31088787
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Add test for memmove beyond buffer length, in parserutils_buffer_discard.
diff --git a/test/regression/INDEX b/test/regression/INDEX
index f6de6cf..63e1a3b 100644
--- a/test/regression/INDEX
+++ b/test/regression/INDEX
@@ -5,3 +5,4 @@
filter-segv Segfault in input filtering
stream-nomem Inputstream buffer expansion
filter-badenc-segv Segfault on resetting bad encoding in filter
+buffer-discard Memmove beyond data length
diff --git a/test/regression/Makefile b/test/regression/Makefile
index c83de62..cf6acee 100644
--- a/test/regression/Makefile
+++ b/test/regression/Makefile
@@ -1,6 +1,8 @@
# Tests
DIR_TEST_ITEMS := filter-segv:filter-segv.c \
- stream-nomem:stream-nomem.c filter-badenc-segv:filter-badenc-segv.c
+ stream-nomem:stream-nomem.c \
+ filter-badenc-segv:filter-badenc-segv.c \
+ buffer-discard:buffer-discard.c
CFLAGS := $(CFLAGS) -I$(CURDIR)/test
diff --git a/test/regression/buffer-discard.c b/test/regression/buffer-discard.c
new file mode 100644
index 0000000..d3eefb8
--- /dev/null
+++ b/test/regression/buffer-discard.c
@@ -0,0 +1,67 @@
+#include <stdio.h>
+#include <string.h>
+
+#include <parserutils/parserutils.h>
+#include <parserutils/utils/buffer.h>
+
+#include "utils/utils.h"
+
+#include "testutils.h"
+
+#define BUFF_LEN 2000
+
+int main(int argc, char **argv)
+{
+ uint8_t data[BUFF_LEN];
+ parserutils_buffer *buf;
+ int i;
+
+ UNUSED(argc);
+ UNUSED(argv);
+
+ assert(parserutils_buffer_create(&buf) == PARSERUTILS_OK);
+
+ /* Populate the data with '4's */
+ for (i = 0; i < BUFF_LEN; i++)
+ data[i] = '4';
+
+ assert(parserutils_buffer_append(buf, data, BUFF_LEN) ==
+ PARSERUTILS_OK);
+
+ /* Double the size, appending 'c's */
+ for (i = 0; i < BUFF_LEN; i++)
+ data[i] = 'c';
+
+ assert(parserutils_buffer_append(buf, data, BUFF_LEN) ==
+ PARSERUTILS_OK);
+ assert(buf->length == 2 * BUFF_LEN);
+
+ /* Now reduce the length by half */
+ /* Buffer length is all '4's now */
+ buf->length = BUFF_LEN;
+
+ /* Now discard half of the 4s from the middle of the buffer */
+ assert(parserutils_buffer_discard(buf, BUFF_LEN / 4, BUFF_LEN / 2) ==
+ PARSERUTILS_OK);
+
+ /* Now check that the length is what we expect */
+ assert(buf->length == BUFF_LEN / 2);
+
+ /* Now check that the buffer contains what we expect */
+ for (i = 0; i < BUFF_LEN / 2; i++)
+ assert(buf->data[i] == '4');
+
+ /* Now check that the space we allocated beyond the buffer length is
+ * as we expect, and not overwritten with 'c', which should be beyond
+ * what the buffer_ code is allowed to move. */
+ for (i = BUFF_LEN / 2; i < BUFF_LEN; i++)
+ assert(buf->data[i] != 'c');
+
+
+ assert(parserutils_buffer_destroy(buf) == PARSERUTILS_OK);
+
+ printf("PASS\n");
+
+ return 0;
+}
+
-----------------------------------------------------------------------
Summary of changes:
src/utils/buffer.c | 2 +-
test/regression/INDEX | 1 +
test/regression/Makefile | 4 ++-
test/regression/buffer-discard.c | 67 ++++++++++++++++++++++++++++++++++++++
4 files changed, 72 insertions(+), 2 deletions(-)
create mode 100644 test/regression/buffer-discard.c
diff --git a/src/utils/buffer.c b/src/utils/buffer.c
index 5a2a7ce..716e67c 100644
--- a/src/utils/buffer.c
+++ b/src/utils/buffer.c
@@ -134,7 +134,7 @@ parserutils_error parserutils_buffer_discard(parserutils_buffer *buffer,
return PARSERUTILS_BADPARM;
memmove(buffer->data + offset, buffer->data + offset + len,
- buffer->length - len);
+ buffer->length - (len + offset));
buffer->length -= len;
diff --git a/test/regression/INDEX b/test/regression/INDEX
index f6de6cf..63e1a3b 100644
--- a/test/regression/INDEX
+++ b/test/regression/INDEX
@@ -5,3 +5,4 @@
filter-segv Segfault in input filtering
stream-nomem Inputstream buffer expansion
filter-badenc-segv Segfault on resetting bad encoding in filter
+buffer-discard Memmove beyond data length
diff --git a/test/regression/Makefile b/test/regression/Makefile
index c83de62..cf6acee 100644
--- a/test/regression/Makefile
+++ b/test/regression/Makefile
@@ -1,6 +1,8 @@
# Tests
DIR_TEST_ITEMS := filter-segv:filter-segv.c \
- stream-nomem:stream-nomem.c filter-badenc-segv:filter-badenc-segv.c
+ stream-nomem:stream-nomem.c \
+ filter-badenc-segv:filter-badenc-segv.c \
+ buffer-discard:buffer-discard.c
CFLAGS := $(CFLAGS) -I$(CURDIR)/test
diff --git a/test/regression/buffer-discard.c b/test/regression/buffer-discard.c
new file mode 100644
index 0000000..d3eefb8
--- /dev/null
+++ b/test/regression/buffer-discard.c
@@ -0,0 +1,67 @@
+#include <stdio.h>
+#include <string.h>
+
+#include <parserutils/parserutils.h>
+#include <parserutils/utils/buffer.h>
+
+#include "utils/utils.h"
+
+#include "testutils.h"
+
+#define BUFF_LEN 2000
+
+int main(int argc, char **argv)
+{
+ uint8_t data[BUFF_LEN];
+ parserutils_buffer *buf;
+ int i;
+
+ UNUSED(argc);
+ UNUSED(argv);
+
+ assert(parserutils_buffer_create(&buf) == PARSERUTILS_OK);
+
+ /* Populate the data with '4's */
+ for (i = 0; i < BUFF_LEN; i++)
+ data[i] = '4';
+
+ assert(parserutils_buffer_append(buf, data, BUFF_LEN) ==
+ PARSERUTILS_OK);
+
+ /* Double the size, appending 'c's */
+ for (i = 0; i < BUFF_LEN; i++)
+ data[i] = 'c';
+
+ assert(parserutils_buffer_append(buf, data, BUFF_LEN) ==
+ PARSERUTILS_OK);
+ assert(buf->length == 2 * BUFF_LEN);
+
+ /* Now reduce the length by half */
+ /* Buffer length is all '4's now */
+ buf->length = BUFF_LEN;
+
+ /* Now discard half of the 4s from the middle of the buffer */
+ assert(parserutils_buffer_discard(buf, BUFF_LEN / 4, BUFF_LEN / 2) ==
+ PARSERUTILS_OK);
+
+ /* Now check that the length is what we expect */
+ assert(buf->length == BUFF_LEN / 2);
+
+ /* Now check that the buffer contains what we expect */
+ for (i = 0; i < BUFF_LEN / 2; i++)
+ assert(buf->data[i] == '4');
+
+ /* Now check that the space we allocated beyond the buffer length is
+ * as we expect, and not overwritten with 'c', which should be beyond
+ * what the buffer_ code is allowed to move. */
+ for (i = BUFF_LEN / 2; i < BUFF_LEN; i++)
+ assert(buf->data[i] != 'c');
+
+
+ assert(parserutils_buffer_destroy(buf) == PARSERUTILS_OK);
+
+ printf("PASS\n");
+
+ return 0;
+}
+
--
Lexer/parser utility functions
9 years, 8 months
- 1
- 0
netsurf: branch master updated. release/3.0-1170-g97c12b9
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/97c12b975c163aa878736...
...commit http://git.netsurf-browser.org/netsurf.git/commit/97c12b975c163aa878736fe...
...tree http://git.netsurf-browser.org/netsurf.git/tree/97c12b975c163aa878736fe66...
The branch, master has been updated
via 97c12b975c163aa878736fe66d1968f0dc5af7eb (commit)
from b16cfd2d6edf20a31613f421582f528a93c40e41 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=97c12b975c163aa8787...
commit 97c12b975c163aa878736fe66d1968f0dc5af7eb
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Add 1px to caret height.
diff --git a/gtk/window.c b/gtk/window.c
index 994c6a2..a3d6d49 100644
--- a/gtk/window.c
+++ b/gtk/window.c
@@ -1154,12 +1154,12 @@ static void gui_window_place_caret(struct gui_window *g, int x, int y, int heigh
{
nsgtk_redraw_caret(g);
- height -= 2;
y += 1;
+ height -= 1;
if (y < clip->y0) {
- height -= clip->y0 - y + 1;
- y = clip->y0 - 1;
+ height -= clip->y0 - y;
+ y = clip->y0;
}
if (y + height > clip->y1) {
-----------------------------------------------------------------------
Summary of changes:
gtk/window.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/gtk/window.c b/gtk/window.c
index 994c6a2..a3d6d49 100644
--- a/gtk/window.c
+++ b/gtk/window.c
@@ -1154,12 +1154,12 @@ static void gui_window_place_caret(struct gui_window *g, int x, int y, int heigh
{
nsgtk_redraw_caret(g);
- height -= 2;
y += 1;
+ height -= 1;
if (y < clip->y0) {
- height -= clip->y0 - y + 1;
- y = clip->y0 - 1;
+ height -= clip->y0 - y;
+ y = clip->y0;
}
if (y + height > clip->y1) {
--
NetSurf Browser
9 years, 8 months
- 1
- 0
netsurf: branch master updated. release/3.0-1169-gb16cfd2
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/b16cfd2d6edf20a31613f...
...commit http://git.netsurf-browser.org/netsurf.git/commit/b16cfd2d6edf20a31613f42...
...tree http://git.netsurf-browser.org/netsurf.git/tree/b16cfd2d6edf20a31613f4215...
The branch, master has been updated
via b16cfd2d6edf20a31613f421582f528a93c40e41 (commit)
from 7738584b3411fa0941579831deae388139eb7a5a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=b16cfd2d6edf20a3161...
commit b16cfd2d6edf20a31613f421582f528a93c40e41
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Fix #0002097, with thanks to Achal-Aggarwal for tracking this down.
diff --git a/desktop/textarea.c b/desktop/textarea.c
index 584642d..bd35a5e 100644
--- a/desktop/textarea.c
+++ b/desktop/textarea.c
@@ -1780,13 +1780,14 @@ static void textarea_setup_text_offsets(struct textarea *ta)
if (ta->flags & TEXTAREA_MULTILINE) {
/* Multiline textarea */
text_y_offset += ta->pad_top;
- text_y_offset_baseline += (ta->line_height * 3 + 2) / 4 +
- ta->pad_top;
+ text_y_offset_baseline +=
+ (ta->line_height * 3 + 2) / 4 + ta->pad_top;
} else {
/* Single line text area; text is vertically centered */
int vis_height = ta->vis_height - 2 * ta->border_width;
text_y_offset += (vis_height - ta->line_height + 1) / 2;
- text_y_offset_baseline += (vis_height * 3 + 2) / 4;
+ text_y_offset_baseline +=
+ (2 * vis_height + ta->line_height + 2) / 4;
}
ta->text_y_offset = text_y_offset;
-----------------------------------------------------------------------
Summary of changes:
desktop/textarea.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/desktop/textarea.c b/desktop/textarea.c
index 584642d..bd35a5e 100644
--- a/desktop/textarea.c
+++ b/desktop/textarea.c
@@ -1780,13 +1780,14 @@ static void textarea_setup_text_offsets(struct textarea *ta)
if (ta->flags & TEXTAREA_MULTILINE) {
/* Multiline textarea */
text_y_offset += ta->pad_top;
- text_y_offset_baseline += (ta->line_height * 3 + 2) / 4 +
- ta->pad_top;
+ text_y_offset_baseline +=
+ (ta->line_height * 3 + 2) / 4 + ta->pad_top;
} else {
/* Single line text area; text is vertically centered */
int vis_height = ta->vis_height - 2 * ta->border_width;
text_y_offset += (vis_height - ta->line_height + 1) / 2;
- text_y_offset_baseline += (vis_height * 3 + 2) / 4;
+ text_y_offset_baseline +=
+ (2 * vis_height + ta->line_height + 2) / 4;
}
ta->text_y_offset = text_y_offset;
--
NetSurf Browser
9 years, 8 months
- 1
- 0
netsurf: branch master updated. release/3.0-1168-g7738584
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/7738584b3411fa0941579...
...commit http://git.netsurf-browser.org/netsurf.git/commit/7738584b3411fa094157983...
...tree http://git.netsurf-browser.org/netsurf.git/tree/7738584b3411fa0941579831d...
The branch, master has been updated
via 7738584b3411fa0941579831deae388139eb7a5a (commit)
from 119b8af2db392c85eb07d0aefbadeda62f1b1cc9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=7738584b3411fa09415...
commit 7738584b3411fa0941579831deae388139eb7a5a
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Don't pass pointer to data that isn't on the stack any more to content_broadcast.
diff --git a/render/html_interaction.c b/render/html_interaction.c
index ce2f78c..e030e57 100644
--- a/render/html_interaction.c
+++ b/render/html_interaction.c
@@ -1261,6 +1261,7 @@ void html_set_focus(html_content *html, html_focus_type focus_type,
union content_msg_data msg_data;
int x_off = 0;
int y_off = 0;
+ struct rect cr;
bool textarea_lost_focus = html->focus_type == HTML_FOCUS_TEXTAREA &&
focus_type != HTML_FOCUS_TEXTAREA;
@@ -1291,7 +1292,6 @@ void html_set_focus(html_content *html, html_focus_type focus_type,
} else if (focus_type != HTML_FOCUS_SELF && hide_caret) {
msg_data.caret.type = CONTENT_CARET_HIDE;
} else {
- struct rect cr;
if (clip != NULL) {
cr = *clip;
cr.x0 += x_off;
-----------------------------------------------------------------------
Summary of changes:
render/html_interaction.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/render/html_interaction.c b/render/html_interaction.c
index ce2f78c..e030e57 100644
--- a/render/html_interaction.c
+++ b/render/html_interaction.c
@@ -1261,6 +1261,7 @@ void html_set_focus(html_content *html, html_focus_type focus_type,
union content_msg_data msg_data;
int x_off = 0;
int y_off = 0;
+ struct rect cr;
bool textarea_lost_focus = html->focus_type == HTML_FOCUS_TEXTAREA &&
focus_type != HTML_FOCUS_TEXTAREA;
@@ -1291,7 +1292,6 @@ void html_set_focus(html_content *html, html_focus_type focus_type,
} else if (focus_type != HTML_FOCUS_SELF && hide_caret) {
msg_data.caret.type = CONTENT_CARET_HIDE;
} else {
- struct rect cr;
if (clip != NULL) {
cr = *clip;
cr.x0 += x_off;
--
NetSurf Browser
9 years, 8 months
- 1
- 0
netsurf: branch chris/idna2008 updated. release/3.0-1171-g9e8d2f0
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/9e8d2f028fc511d0471e7...
...commit http://git.netsurf-browser.org/netsurf.git/commit/9e8d2f028fc511d0471e770...
...tree http://git.netsurf-browser.org/netsurf.git/tree/9e8d2f028fc511d0471e77060...
The branch, chris/idna2008 has been updated
via 9e8d2f028fc511d0471e7706095e6b8da620fc18 (commit)
from 68bfa6b5b24a4e7cd0cdc394e684d383f957597e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=9e8d2f028fc511d0471...
commit 9e8d2f028fc511d0471e7706095e6b8da620fc18
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Use correct and consistent terminology, remove debug logging
diff --git a/utils/idna.c b/utils/idna.c
index d93fb1e..fcec47d 100644
--- a/utils/idna.c
+++ b/utils/idna.c
@@ -112,7 +112,7 @@ static bool idna__contexto_rule(int32_t cp)
* \param index character in the string which is CONTEXTJ
* \return true if conforming
*/
-static bool idna__contextj_rule(int32_t *string, int index, size_t len)
+static bool idna__contextj_rule(int32_t *label, int index, size_t len)
{
const utf8proc_property_t *unicode_props;
idna_unicode_jt joining_type;
@@ -123,18 +123,18 @@ static bool idna__contextj_rule(int32_t *string, int index, size_t len)
* http://www.iana.org/assignments/idna-tables-5.2.0/idna-tables-5.2.0.xml
*/
- if (string[index] == 0x200c) {
+ if (label[index] == 0x200c) {
if (index == 0) return false; /* No previous character */
- unicode_props = utf8proc_get_property(string[index - 1]);
+ unicode_props = utf8proc_get_property(label[index - 1]);
if (unicode_props->combining_class == UTF8PROC_CCC_VIRAMA)
return true;
match = false;
for (i = 0; i < (index - 1); i++) {
- joining_type = idna__jt_property(string[i]);
+ joining_type = idna__jt_property(label[i]);
if (((joining_type == IDNA_UNICODE_JT_L) ||
(joining_type == IDNA_UNICODE_JT_D)) &&
- (idna__jt_property(string[i+1]) == IDNA_UNICODE_JT_T)) {
+ (idna__jt_property(label[i+1]) == IDNA_UNICODE_JT_T)) {
match = true;
break;
}
@@ -142,11 +142,11 @@ static bool idna__contextj_rule(int32_t *string, int index, size_t len)
if (match == false) return false;
- if (idna__jt_property(string[index+1]) != IDNA_UNICODE_JT_T)
+ if (idna__jt_property(label[index+1]) != IDNA_UNICODE_JT_T)
return false;
for (i = (index + 1); i < (int)len; i++) {
- joining_type = idna__jt_property(string[i]);
+ joining_type = idna__jt_property(label[i]);
if ((joining_type == IDNA_UNICODE_JT_R) ||
(joining_type == IDNA_UNICODE_JT_D)) {
return true;
@@ -156,9 +156,9 @@ static bool idna__contextj_rule(int32_t *string, int index, size_t len)
return false;
- } else if (string[index] == 0x200d) {
+ } else if (label[index] == 0x200d) {
if (index == 0) return false; /* No previous character */
- unicode_props = utf8proc_get_property(string[index - 1]);
+ unicode_props = utf8proc_get_property(label[index - 1]);
if (unicode_props->combining_class == UTF8PROC_CCC_VIRAMA)
return true;
return false;
@@ -172,31 +172,31 @@ static bool idna__contextj_rule(int32_t *string, int index, size_t len)
/**
* Convert a UTF-8 string to UCS-4
*
- * \param utf8_host UTF-8 string containing host
- * \param len Length of host string (in bytes)
- * \param ucs4_host Pointer to update with the output
+ * \param utf8_label UTF-8 string containing host label
+ * \param len Length of host label (in bytes)
+ * \param ucs4_label Pointer to update with the output
* \param ucs4_len Pointer to update with the length
* \return NSERROR_OK on success, appropriate error otherwise
*
* If return value != NSERROR_OK, output will be left untouched.
*/
-static nserror idna__utf8_to_ucs4(const char *utf8_host, size_t len, int32_t **ucs4_host, size_t *ucs4_len)
+static nserror idna__utf8_to_ucs4(const char *utf8_label, size_t len, int32_t **ucs4_label, size_t *ucs4_len)
{
- int32_t *nfc_host;
+ int32_t *nfc_label;
ssize_t nfc_size;
- nfc_host = malloc(len * 4);
- if (nfc_host == NULL) return NSERROR_NOMEM;
+ nfc_label = malloc(len * 4);
+ if (nfc_label == NULL) return NSERROR_NOMEM;
- nfc_size = utf8proc_decompose((const uint8_t *)utf8_host, len,
- nfc_host, len * 4, UTF8PROC_STABLE | UTF8PROC_COMPOSE);
+ nfc_size = utf8proc_decompose((const uint8_t *)utf8_label, len,
+ nfc_label, len * 4, UTF8PROC_STABLE | UTF8PROC_COMPOSE);
if(nfc_size < 0) return NSERROR_NOMEM;
- nfc_size = utf8proc_normalise(nfc_host, nfc_size,
+ nfc_size = utf8proc_normalise(nfc_label, nfc_size,
UTF8PROC_STABLE | UTF8PROC_COMPOSE);
if(nfc_size < 0) return NSERROR_NOMEM;
- *ucs4_host = nfc_host;
+ *ucs4_label = nfc_label;
*ucs4_len = nfc_size;
return NSERROR_OK;
}
@@ -205,28 +205,28 @@ static nserror idna__utf8_to_ucs4(const char *utf8_host, size_t len, int32_t **u
/**
* Convert a UCS-4 string to UTF-8
*
- * \param ucs4_host UCS-4 string containing host
- * \param ucs4_len Length of host string (in bytes)
- * \param utf8_host Pointer to update with the output
+ * \param ucs4_label UCS-4 string containing host label
+ * \param ucs4_len Length of host label (in bytes)
+ * \param utf8_label Pointer to update with the output
* \param utf8_len Pointer to update with the length
* \return NSERROR_OK on success, appropriate error otherwise
*
* If return value != NSERROR_OK, output will be left untouched.
*/
-static nserror idna__ucs4_to_utf8(const int32_t *ucs4_host, size_t ucs4_len, char **utf8_host, size_t *utf8_len)
+static nserror idna__ucs4_to_utf8(const int32_t *ucs4_label, size_t ucs4_len, char **utf8_label, size_t *utf8_len)
{
- int32_t *nfc_host;
+ int32_t *nfc_label;
ssize_t nfc_size = ucs4_len;
- nfc_host = malloc(1 + ucs4_len * 4);
- if (nfc_host == NULL) return NSERROR_NOMEM;
- memcpy(nfc_host, ucs4_host, ucs4_len * 4);
+ nfc_label = malloc(1 + ucs4_len * 4);
+ if (nfc_label == NULL) return NSERROR_NOMEM;
+ memcpy(nfc_label, ucs4_label, ucs4_len * 4);
- nfc_size = utf8proc_reencode(nfc_host, ucs4_len,
+ nfc_size = utf8proc_reencode(nfc_label, ucs4_len,
UTF8PROC_STABLE | UTF8PROC_COMPOSE);
if(nfc_size < 0) return NSERROR_NOMEM;
- *utf8_host = (char *)nfc_host;
+ *utf8_label = (char *)nfc_label;
*utf8_len = nfc_size;
return NSERROR_OK;
@@ -236,17 +236,17 @@ static nserror idna__ucs4_to_utf8(const int32_t *ucs4_host, size_t ucs4_len, cha
/**
* Convert a host label in UCS-4 to an ACE version
*
- * \param ucs4_host UCS-4 NFC string containing host
- * \param len Length of host string (in characters/codepoints)
- * \param ace_host ASCII-compatible encoded version
- * \param out_len Length of ace_host
+ * \param ucs4_label UCS-4 NFC string containing host label
+ * \param len Length of host label (in characters/codepoints)
+ * \param ace_label ASCII-compatible encoded version
+ * \param out_len Length of ace_label
* \return NSERROR_OK on success, appropriate error otherwise
*
* If return value != NSERROR_OK, output will be left untouched.
*/
-static nserror idna__ucs4_to_ace(int32_t *ucs4_host, size_t len, char **ace_host, size_t *out_len)
+static nserror idna__ucs4_to_ace(int32_t *ucs4_label, size_t len, char **ace_label, size_t *out_len)
{
- char punycode[65]; /* max length of host part + NULL */
+ char punycode[65]; /* max length of host label + NULL */
enum punycode_status status;
size_t output_length = 60; /* punycode length - 4 - 1 */
@@ -255,7 +255,7 @@ static nserror idna__ucs4_to_ace(int32_t *ucs4_host, size_t len, char **ace_host
punycode[2] = '-';
punycode[3] = '-';
- status = punycode_encode(len, (const punycode_uint *)ucs4_host,
+ status = punycode_encode(len, (const punycode_uint *)ucs4_label,
NULL, &output_length, punycode + 4);
if (status == punycode_bad_input) {
LOG(("Bad input"));
@@ -271,7 +271,7 @@ static nserror idna__ucs4_to_ace(int32_t *ucs4_host, size_t len, char **ace_host
output_length += SLEN("xn--");
punycode[output_length] = '\0';
- *ace_host = strdup(punycode);
+ *ace_label = strdup(punycode);
*out_len = output_length;
return NSERROR_OK;
@@ -281,28 +281,28 @@ static nserror idna__ucs4_to_ace(int32_t *ucs4_host, size_t len, char **ace_host
/**
* Convert a host label in ACE format to UCS-4
*
- * \param ace_host ASCII string containing host
- * \param ace_len Length of host string
- * \param ucs4_host Pointer to hold UCS4 decoded version
- * \param ucs4_len Pointer to hold length of ucs4_host
+ * \param ace_label ASCII string containing host label
+ * \param ace_len Length of host label
+ * \param ucs4_label Pointer to hold UCS4 decoded version
+ * \param ucs4_len Pointer to hold length of ucs4_label
* \return NSERROR_OK on success, appropriate error otherwise
*
* If return value != NSERROR_OK, output will be left untouched.
*/
-static nserror idna__ace_to_ucs4(const char *ace_host, size_t ace_len, int32_t **ucs4_host, size_t *ucs4_len)
+static nserror idna__ace_to_ucs4(const char *ace_label, size_t ace_len, int32_t **ucs4_label, size_t *ucs4_len)
{
int32_t *ucs4;
enum punycode_status status;
size_t output_length = ace_len; /* never exceeds input length */
/* The header should always have been checked before calling */
- assert((ace_host[0] == 'x') && (ace_host[1] == 'n') &&
- (ace_host[2] == '-') && (ace_host[3] == '-'));
+ assert((ace_label[0] == 'x') && (ace_label[1] == 'n') &&
+ (ace_label[2] == '-') && (ace_label[3] == '-'));
ucs4 = malloc(output_length * 4);
if (ucs4 == NULL) return NSERROR_NOMEM;
- status = punycode_decode(ace_len - 4, ace_host + 4,
+ status = punycode_decode(ace_len - 4, ace_label + 4,
&output_length, (punycode_uint *)ucs4, NULL);
if (status == punycode_bad_input) {
@@ -318,7 +318,7 @@ static nserror idna__ace_to_ucs4(const char *ace_host, size_t ace_len, int32_t *
ucs4[output_length] = '\0';
- *ucs4_host = ucs4;
+ *ucs4_label = ucs4;
*ucs4_len = output_length;
return NSERROR_OK;
@@ -332,7 +332,7 @@ static nserror idna__ace_to_ucs4(const char *ace_host, size_t ace_len, int32_t *
* \param max_length Length of host string to search (in bytes)
* \return Distance to next separator character or end of string
*/
-static size_t idna__host_part_length(const char *host, size_t max_length)
+static size_t idna__host_label_length(const char *host, size_t max_length)
{
const char *p = host;
size_t length = 0;
@@ -350,11 +350,11 @@ static size_t idna__host_part_length(const char *host, size_t max_length)
/**
* Check if a host label is valid for IDNA2008
*
- * \param host Host label to check (UCS-4)
- * \param len Length of host string (in characters/codepoints)
+ * \param label Host label to check (UCS-4)
+ * \param len Length of host label (in characters/codepoints)
* \return true if compliant, false otherwise
*/
-static bool idna__is_valid(int32_t *host, size_t len)
+static bool idna__is_valid(int32_t *label, size_t len)
{
const utf8proc_property_t *unicode_props;
idna_property idna_prop;
@@ -366,13 +366,13 @@ static bool idna__is_valid(int32_t *host, size_t len)
*/
/* 2. Check characters 3 and 4 are not '--'. */
- if ((host[2] == 0x002d) && (host[3] == 0x002d)) {
+ if ((label[2] == 0x002d) && (label[3] == 0x002d)) {
LOG(("Check failed: characters 2 and 3 are '--'"));
return false;
}
/* 3. Check the first character is not a combining mark */
- unicode_props = utf8proc_get_property(host[0]);
+ unicode_props = utf8proc_get_property(label[0]);
if ((unicode_props->category == UTF8PROC_CATEGORY_MN) ||
(unicode_props->category == UTF8PROC_CATEGORY_MC) ||
@@ -382,18 +382,18 @@ static bool idna__is_valid(int32_t *host, size_t len)
}
for (i = 0; i < len; i++) {
- idna_prop = idna__cp_property(host[i]);
+ idna_prop = idna__cp_property(label[i]);
/* 4. Check characters not DISALLOWED by RFC5892 */
if (idna_prop == IDNA_P_DISALLOWED) {
- LOG(("Check failed: character %d (%x) is DISALLOWED", i, host[i]));
+ LOG(("Check failed: character %d (%x) is DISALLOWED", i, label[i]));
return false;
}
/* 5. Check CONTEXTJ characters conform to defined rules */
if (idna_prop == IDNA_P_CONTEXTJ) {
- if (idna__contextj_rule(host, i, len) == false) {
- LOG(("Check failed: character %d (%x) does not conform to CONTEXTJ rule", i, host[i]));
+ if (idna__contextj_rule(label, i, len) == false) {
+ LOG(("Check failed: character %d (%x) does not conform to CONTEXTJ rule", i, label[i]));
return false;
}
}
@@ -401,15 +401,15 @@ static bool idna__is_valid(int32_t *host, size_t len)
/* 6. Check CONTEXTO characters have a rule defined */
/*\todo optionally we can check conformance to this rule */
if (idna_prop == IDNA_P_CONTEXTO) {
- if (idna__contexto_rule(host[i]) == false) {
- LOG(("Check failed: character %d (%x) has no CONTEXTO rule defined", i, host[i]));
+ if (idna__contexto_rule(label[i]) == false) {
+ LOG(("Check failed: character %d (%x) has no CONTEXTO rule defined", i, label[i]));
return false;
}
}
/* 7. Check characters are not UNASSIGNED */
if (idna_prop == IDNA_P_UNASSIGNED) {
- LOG(("Check failed: character %d (%x) is UNASSIGNED", i, host[i]));
+ LOG(("Check failed: character %d (%x) is UNASSIGNED", i, label[i]));
return false;
}
@@ -423,13 +423,13 @@ static bool idna__is_valid(int32_t *host, size_t len)
/**
* Check if a host label is LDH
*
- * \param host Host label to check
- * \param len Length of host string
+ * \param label Host label to check
+ * \param len Length of host label
* \return true if LDH compliant, false otherwise
*/
-static bool idna__is_ldh(const char *host, size_t len)
+static bool idna__is_ldh(const char *label, size_t len)
{
- const char *p = host;
+ const char *p = label;
size_t i = 0;
/* Check for leading or trailing hyphens */
@@ -454,19 +454,19 @@ static bool idna__is_ldh(const char *host, size_t len)
/**
* Check if a host label appears to be ACE
*
- * \param host Host label to check
- * \param len Length of host string
+ * \param label Host label to check
+ * \param len Length of host label
* \return true if ACE compliant, false otherwise
*/
-static bool idna__is_ace(const char *host, size_t len)
+static bool idna__is_ace(const char *label, size_t len)
{
/* Check it is a valid DNS string */
- if (idna__is_ldh(host, len) == false)
+ if (idna__is_ldh(label, len) == false)
return false;
/* Check the ACE prefix is present */
- if ((host[0] == 'x') && (host[1] == 'n') &&
- (host[2] == '-') && (host[3] == '-'))
+ if ((label[0] == 'x') && (label[1] == 'n') &&
+ (label[2] == '-') && (label[3] == '-'))
return true;
return false;
@@ -513,16 +513,16 @@ nserror idna_encode(const char *host, size_t len, char **ace_host, size_t *ace_l
{
nserror error;
int32_t *ucs4_host;
- size_t part_len, output_len, ucs4_len, fqdn_len = 0;
+ size_t label_len, output_len, ucs4_len, fqdn_len = 0;
char fqdn[256];
char *output, *fqdn_p = fqdn;
- while ((part_len = idna__host_part_length(host, len)) != 0) {
- if (idna__is_ldh(host, part_len) == false) {
+ while ((label_len = idna__host_label_length(host, len)) != 0) {
+ if (idna__is_ldh(host, label_len) == false) {
/* This string is IDN or invalid */
/* Convert to Unicode */
- if ((error = idna__utf8_to_ucs4(host, part_len,
+ if ((error = idna__utf8_to_ucs4(host, label_len,
&ucs4_host, &ucs4_len)) != NSERROR_OK)
return error;
@@ -541,31 +541,30 @@ nserror idna_encode(const char *host, size_t len, char **ace_host, size_t *ace_l
fqdn_len += output_len;
} else {
/* This is already a DNS-valid ASCII string */
- if ((idna__is_ace(host, part_len) == true) &&
- (idna__verify(host, part_len) == false)) {
+ if ((idna__is_ace(host, label_len) == true) &&
+ (idna__verify(host, label_len) == false)) {
LOG(("Cannot verify ACE label %s", host));
return NSERROR_BAD_URL;
}
- strncpy(fqdn_p, host, part_len);
- fqdn_p += part_len;
- fqdn_len += part_len;
+ strncpy(fqdn_p, host, label_len);
+ fqdn_p += label_len;
+ fqdn_len += label_len;
}
*fqdn_p = '.';
fqdn_p++;
fqdn_len++;
- host += part_len;
+ host += label_len;
if ((*host == '\0') || (*host == ':')) break;
host++;
- len = len - part_len - 1;
+ len = len - label_len - 1;
}
fqdn_p--;
*fqdn_p = '\0';
*ace_host = strdup(fqdn);
*ace_len = fqdn_len - 1; /* last character is NULL */
- LOG(("Punycode FQDN >> %s", *ace_host));
return NSERROR_OK;
}
@@ -576,16 +575,16 @@ nserror idna_decode(const char *ace_host, size_t ace_len, char **host, size_t *h
{
nserror error;
int32_t *ucs4_host;
- size_t part_len, output_len, ucs4_len, fqdn_len = 0;
+ size_t label_len, output_len, ucs4_len, fqdn_len = 0;
char fqdn[256];
char *output, *fqdn_p = fqdn;
- while ((part_len = idna__host_part_length(ace_host, ace_len)) != 0) {
- if (idna__is_ace(ace_host, part_len) == true) {
+ while ((label_len = idna__host_label_length(ace_host, ace_len)) != 0) {
+ if (idna__is_ace(ace_host, label_len) == true) {
/* This string is DNS-valid and (probably) encoded */
/* Decode to Unicode */
- error = idna__ace_to_ucs4(ace_host, part_len,
+ error = idna__ace_to_ucs4(ace_host, label_len,
&ucs4_host, &ucs4_len);
if (error != NSERROR_OK) return error;
@@ -601,26 +600,26 @@ nserror idna_decode(const char *ace_host, size_t ace_len, char **host, size_t *h
fqdn_len += output_len;
} else {
/* Not ACE */
- memcpy(fqdn_p, ace_host, part_len);
- fqdn_p += part_len;
- fqdn_len += part_len;
+ memcpy(fqdn_p, ace_host, label_len);
+ fqdn_p += label_len;
+ fqdn_len += label_len;
}
*fqdn_p = '.';
fqdn_p++;
fqdn_len++;
- ace_host += part_len;
+ ace_host += label_len;
if ((*ace_host == '\0') || (*ace_host == ':')) break;
ace_host++;
- ace_len = ace_len - part_len - 1;
+ ace_len = ace_len - label_len - 1;
}
fqdn_p--;
*fqdn_p = '\0';
*host = strdup(fqdn);
*host_len = fqdn_len - 1; /* last character is NULL */
- LOG(("Decoded FQDN >> %s", *host));
+
return NSERROR_OK;
}
-----------------------------------------------------------------------
Summary of changes:
utils/idna.c | 183 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 91 insertions(+), 92 deletions(-)
diff --git a/utils/idna.c b/utils/idna.c
index d93fb1e..fcec47d 100644
--- a/utils/idna.c
+++ b/utils/idna.c
@@ -112,7 +112,7 @@ static bool idna__contexto_rule(int32_t cp)
* \param index character in the string which is CONTEXTJ
* \return true if conforming
*/
-static bool idna__contextj_rule(int32_t *string, int index, size_t len)
+static bool idna__contextj_rule(int32_t *label, int index, size_t len)
{
const utf8proc_property_t *unicode_props;
idna_unicode_jt joining_type;
@@ -123,18 +123,18 @@ static bool idna__contextj_rule(int32_t *string, int index, size_t len)
* http://www.iana.org/assignments/idna-tables-5.2.0/idna-tables-5.2.0.xml
*/
- if (string[index] == 0x200c) {
+ if (label[index] == 0x200c) {
if (index == 0) return false; /* No previous character */
- unicode_props = utf8proc_get_property(string[index - 1]);
+ unicode_props = utf8proc_get_property(label[index - 1]);
if (unicode_props->combining_class == UTF8PROC_CCC_VIRAMA)
return true;
match = false;
for (i = 0; i < (index - 1); i++) {
- joining_type = idna__jt_property(string[i]);
+ joining_type = idna__jt_property(label[i]);
if (((joining_type == IDNA_UNICODE_JT_L) ||
(joining_type == IDNA_UNICODE_JT_D)) &&
- (idna__jt_property(string[i+1]) == IDNA_UNICODE_JT_T)) {
+ (idna__jt_property(label[i+1]) == IDNA_UNICODE_JT_T)) {
match = true;
break;
}
@@ -142,11 +142,11 @@ static bool idna__contextj_rule(int32_t *string, int index, size_t len)
if (match == false) return false;
- if (idna__jt_property(string[index+1]) != IDNA_UNICODE_JT_T)
+ if (idna__jt_property(label[index+1]) != IDNA_UNICODE_JT_T)
return false;
for (i = (index + 1); i < (int)len; i++) {
- joining_type = idna__jt_property(string[i]);
+ joining_type = idna__jt_property(label[i]);
if ((joining_type == IDNA_UNICODE_JT_R) ||
(joining_type == IDNA_UNICODE_JT_D)) {
return true;
@@ -156,9 +156,9 @@ static bool idna__contextj_rule(int32_t *string, int index, size_t len)
return false;
- } else if (string[index] == 0x200d) {
+ } else if (label[index] == 0x200d) {
if (index == 0) return false; /* No previous character */
- unicode_props = utf8proc_get_property(string[index - 1]);
+ unicode_props = utf8proc_get_property(label[index - 1]);
if (unicode_props->combining_class == UTF8PROC_CCC_VIRAMA)
return true;
return false;
@@ -172,31 +172,31 @@ static bool idna__contextj_rule(int32_t *string, int index, size_t len)
/**
* Convert a UTF-8 string to UCS-4
*
- * \param utf8_host UTF-8 string containing host
- * \param len Length of host string (in bytes)
- * \param ucs4_host Pointer to update with the output
+ * \param utf8_label UTF-8 string containing host label
+ * \param len Length of host label (in bytes)
+ * \param ucs4_label Pointer to update with the output
* \param ucs4_len Pointer to update with the length
* \return NSERROR_OK on success, appropriate error otherwise
*
* If return value != NSERROR_OK, output will be left untouched.
*/
-static nserror idna__utf8_to_ucs4(const char *utf8_host, size_t len, int32_t **ucs4_host, size_t *ucs4_len)
+static nserror idna__utf8_to_ucs4(const char *utf8_label, size_t len, int32_t **ucs4_label, size_t *ucs4_len)
{
- int32_t *nfc_host;
+ int32_t *nfc_label;
ssize_t nfc_size;
- nfc_host = malloc(len * 4);
- if (nfc_host == NULL) return NSERROR_NOMEM;
+ nfc_label = malloc(len * 4);
+ if (nfc_label == NULL) return NSERROR_NOMEM;
- nfc_size = utf8proc_decompose((const uint8_t *)utf8_host, len,
- nfc_host, len * 4, UTF8PROC_STABLE | UTF8PROC_COMPOSE);
+ nfc_size = utf8proc_decompose((const uint8_t *)utf8_label, len,
+ nfc_label, len * 4, UTF8PROC_STABLE | UTF8PROC_COMPOSE);
if(nfc_size < 0) return NSERROR_NOMEM;
- nfc_size = utf8proc_normalise(nfc_host, nfc_size,
+ nfc_size = utf8proc_normalise(nfc_label, nfc_size,
UTF8PROC_STABLE | UTF8PROC_COMPOSE);
if(nfc_size < 0) return NSERROR_NOMEM;
- *ucs4_host = nfc_host;
+ *ucs4_label = nfc_label;
*ucs4_len = nfc_size;
return NSERROR_OK;
}
@@ -205,28 +205,28 @@ static nserror idna__utf8_to_ucs4(const char *utf8_host, size_t len, int32_t **u
/**
* Convert a UCS-4 string to UTF-8
*
- * \param ucs4_host UCS-4 string containing host
- * \param ucs4_len Length of host string (in bytes)
- * \param utf8_host Pointer to update with the output
+ * \param ucs4_label UCS-4 string containing host label
+ * \param ucs4_len Length of host label (in bytes)
+ * \param utf8_label Pointer to update with the output
* \param utf8_len Pointer to update with the length
* \return NSERROR_OK on success, appropriate error otherwise
*
* If return value != NSERROR_OK, output will be left untouched.
*/
-static nserror idna__ucs4_to_utf8(const int32_t *ucs4_host, size_t ucs4_len, char **utf8_host, size_t *utf8_len)
+static nserror idna__ucs4_to_utf8(const int32_t *ucs4_label, size_t ucs4_len, char **utf8_label, size_t *utf8_len)
{
- int32_t *nfc_host;
+ int32_t *nfc_label;
ssize_t nfc_size = ucs4_len;
- nfc_host = malloc(1 + ucs4_len * 4);
- if (nfc_host == NULL) return NSERROR_NOMEM;
- memcpy(nfc_host, ucs4_host, ucs4_len * 4);
+ nfc_label = malloc(1 + ucs4_len * 4);
+ if (nfc_label == NULL) return NSERROR_NOMEM;
+ memcpy(nfc_label, ucs4_label, ucs4_len * 4);
- nfc_size = utf8proc_reencode(nfc_host, ucs4_len,
+ nfc_size = utf8proc_reencode(nfc_label, ucs4_len,
UTF8PROC_STABLE | UTF8PROC_COMPOSE);
if(nfc_size < 0) return NSERROR_NOMEM;
- *utf8_host = (char *)nfc_host;
+ *utf8_label = (char *)nfc_label;
*utf8_len = nfc_size;
return NSERROR_OK;
@@ -236,17 +236,17 @@ static nserror idna__ucs4_to_utf8(const int32_t *ucs4_host, size_t ucs4_len, cha
/**
* Convert a host label in UCS-4 to an ACE version
*
- * \param ucs4_host UCS-4 NFC string containing host
- * \param len Length of host string (in characters/codepoints)
- * \param ace_host ASCII-compatible encoded version
- * \param out_len Length of ace_host
+ * \param ucs4_label UCS-4 NFC string containing host label
+ * \param len Length of host label (in characters/codepoints)
+ * \param ace_label ASCII-compatible encoded version
+ * \param out_len Length of ace_label
* \return NSERROR_OK on success, appropriate error otherwise
*
* If return value != NSERROR_OK, output will be left untouched.
*/
-static nserror idna__ucs4_to_ace(int32_t *ucs4_host, size_t len, char **ace_host, size_t *out_len)
+static nserror idna__ucs4_to_ace(int32_t *ucs4_label, size_t len, char **ace_label, size_t *out_len)
{
- char punycode[65]; /* max length of host part + NULL */
+ char punycode[65]; /* max length of host label + NULL */
enum punycode_status status;
size_t output_length = 60; /* punycode length - 4 - 1 */
@@ -255,7 +255,7 @@ static nserror idna__ucs4_to_ace(int32_t *ucs4_host, size_t len, char **ace_host
punycode[2] = '-';
punycode[3] = '-';
- status = punycode_encode(len, (const punycode_uint *)ucs4_host,
+ status = punycode_encode(len, (const punycode_uint *)ucs4_label,
NULL, &output_length, punycode + 4);
if (status == punycode_bad_input) {
LOG(("Bad input"));
@@ -271,7 +271,7 @@ static nserror idna__ucs4_to_ace(int32_t *ucs4_host, size_t len, char **ace_host
output_length += SLEN("xn--");
punycode[output_length] = '\0';
- *ace_host = strdup(punycode);
+ *ace_label = strdup(punycode);
*out_len = output_length;
return NSERROR_OK;
@@ -281,28 +281,28 @@ static nserror idna__ucs4_to_ace(int32_t *ucs4_host, size_t len, char **ace_host
/**
* Convert a host label in ACE format to UCS-4
*
- * \param ace_host ASCII string containing host
- * \param ace_len Length of host string
- * \param ucs4_host Pointer to hold UCS4 decoded version
- * \param ucs4_len Pointer to hold length of ucs4_host
+ * \param ace_label ASCII string containing host label
+ * \param ace_len Length of host label
+ * \param ucs4_label Pointer to hold UCS4 decoded version
+ * \param ucs4_len Pointer to hold length of ucs4_label
* \return NSERROR_OK on success, appropriate error otherwise
*
* If return value != NSERROR_OK, output will be left untouched.
*/
-static nserror idna__ace_to_ucs4(const char *ace_host, size_t ace_len, int32_t **ucs4_host, size_t *ucs4_len)
+static nserror idna__ace_to_ucs4(const char *ace_label, size_t ace_len, int32_t **ucs4_label, size_t *ucs4_len)
{
int32_t *ucs4;
enum punycode_status status;
size_t output_length = ace_len; /* never exceeds input length */
/* The header should always have been checked before calling */
- assert((ace_host[0] == 'x') && (ace_host[1] == 'n') &&
- (ace_host[2] == '-') && (ace_host[3] == '-'));
+ assert((ace_label[0] == 'x') && (ace_label[1] == 'n') &&
+ (ace_label[2] == '-') && (ace_label[3] == '-'));
ucs4 = malloc(output_length * 4);
if (ucs4 == NULL) return NSERROR_NOMEM;
- status = punycode_decode(ace_len - 4, ace_host + 4,
+ status = punycode_decode(ace_len - 4, ace_label + 4,
&output_length, (punycode_uint *)ucs4, NULL);
if (status == punycode_bad_input) {
@@ -318,7 +318,7 @@ static nserror idna__ace_to_ucs4(const char *ace_host, size_t ace_len, int32_t *
ucs4[output_length] = '\0';
- *ucs4_host = ucs4;
+ *ucs4_label = ucs4;
*ucs4_len = output_length;
return NSERROR_OK;
@@ -332,7 +332,7 @@ static nserror idna__ace_to_ucs4(const char *ace_host, size_t ace_len, int32_t *
* \param max_length Length of host string to search (in bytes)
* \return Distance to next separator character or end of string
*/
-static size_t idna__host_part_length(const char *host, size_t max_length)
+static size_t idna__host_label_length(const char *host, size_t max_length)
{
const char *p = host;
size_t length = 0;
@@ -350,11 +350,11 @@ static size_t idna__host_part_length(const char *host, size_t max_length)
/**
* Check if a host label is valid for IDNA2008
*
- * \param host Host label to check (UCS-4)
- * \param len Length of host string (in characters/codepoints)
+ * \param label Host label to check (UCS-4)
+ * \param len Length of host label (in characters/codepoints)
* \return true if compliant, false otherwise
*/
-static bool idna__is_valid(int32_t *host, size_t len)
+static bool idna__is_valid(int32_t *label, size_t len)
{
const utf8proc_property_t *unicode_props;
idna_property idna_prop;
@@ -366,13 +366,13 @@ static bool idna__is_valid(int32_t *host, size_t len)
*/
/* 2. Check characters 3 and 4 are not '--'. */
- if ((host[2] == 0x002d) && (host[3] == 0x002d)) {
+ if ((label[2] == 0x002d) && (label[3] == 0x002d)) {
LOG(("Check failed: characters 2 and 3 are '--'"));
return false;
}
/* 3. Check the first character is not a combining mark */
- unicode_props = utf8proc_get_property(host[0]);
+ unicode_props = utf8proc_get_property(label[0]);
if ((unicode_props->category == UTF8PROC_CATEGORY_MN) ||
(unicode_props->category == UTF8PROC_CATEGORY_MC) ||
@@ -382,18 +382,18 @@ static bool idna__is_valid(int32_t *host, size_t len)
}
for (i = 0; i < len; i++) {
- idna_prop = idna__cp_property(host[i]);
+ idna_prop = idna__cp_property(label[i]);
/* 4. Check characters not DISALLOWED by RFC5892 */
if (idna_prop == IDNA_P_DISALLOWED) {
- LOG(("Check failed: character %d (%x) is DISALLOWED", i, host[i]));
+ LOG(("Check failed: character %d (%x) is DISALLOWED", i, label[i]));
return false;
}
/* 5. Check CONTEXTJ characters conform to defined rules */
if (idna_prop == IDNA_P_CONTEXTJ) {
- if (idna__contextj_rule(host, i, len) == false) {
- LOG(("Check failed: character %d (%x) does not conform to CONTEXTJ rule", i, host[i]));
+ if (idna__contextj_rule(label, i, len) == false) {
+ LOG(("Check failed: character %d (%x) does not conform to CONTEXTJ rule", i, label[i]));
return false;
}
}
@@ -401,15 +401,15 @@ static bool idna__is_valid(int32_t *host, size_t len)
/* 6. Check CONTEXTO characters have a rule defined */
/*\todo optionally we can check conformance to this rule */
if (idna_prop == IDNA_P_CONTEXTO) {
- if (idna__contexto_rule(host[i]) == false) {
- LOG(("Check failed: character %d (%x) has no CONTEXTO rule defined", i, host[i]));
+ if (idna__contexto_rule(label[i]) == false) {
+ LOG(("Check failed: character %d (%x) has no CONTEXTO rule defined", i, label[i]));
return false;
}
}
/* 7. Check characters are not UNASSIGNED */
if (idna_prop == IDNA_P_UNASSIGNED) {
- LOG(("Check failed: character %d (%x) is UNASSIGNED", i, host[i]));
+ LOG(("Check failed: character %d (%x) is UNASSIGNED", i, label[i]));
return false;
}
@@ -423,13 +423,13 @@ static bool idna__is_valid(int32_t *host, size_t len)
/**
* Check if a host label is LDH
*
- * \param host Host label to check
- * \param len Length of host string
+ * \param label Host label to check
+ * \param len Length of host label
* \return true if LDH compliant, false otherwise
*/
-static bool idna__is_ldh(const char *host, size_t len)
+static bool idna__is_ldh(const char *label, size_t len)
{
- const char *p = host;
+ const char *p = label;
size_t i = 0;
/* Check for leading or trailing hyphens */
@@ -454,19 +454,19 @@ static bool idna__is_ldh(const char *host, size_t len)
/**
* Check if a host label appears to be ACE
*
- * \param host Host label to check
- * \param len Length of host string
+ * \param label Host label to check
+ * \param len Length of host label
* \return true if ACE compliant, false otherwise
*/
-static bool idna__is_ace(const char *host, size_t len)
+static bool idna__is_ace(const char *label, size_t len)
{
/* Check it is a valid DNS string */
- if (idna__is_ldh(host, len) == false)
+ if (idna__is_ldh(label, len) == false)
return false;
/* Check the ACE prefix is present */
- if ((host[0] == 'x') && (host[1] == 'n') &&
- (host[2] == '-') && (host[3] == '-'))
+ if ((label[0] == 'x') && (label[1] == 'n') &&
+ (label[2] == '-') && (label[3] == '-'))
return true;
return false;
@@ -513,16 +513,16 @@ nserror idna_encode(const char *host, size_t len, char **ace_host, size_t *ace_l
{
nserror error;
int32_t *ucs4_host;
- size_t part_len, output_len, ucs4_len, fqdn_len = 0;
+ size_t label_len, output_len, ucs4_len, fqdn_len = 0;
char fqdn[256];
char *output, *fqdn_p = fqdn;
- while ((part_len = idna__host_part_length(host, len)) != 0) {
- if (idna__is_ldh(host, part_len) == false) {
+ while ((label_len = idna__host_label_length(host, len)) != 0) {
+ if (idna__is_ldh(host, label_len) == false) {
/* This string is IDN or invalid */
/* Convert to Unicode */
- if ((error = idna__utf8_to_ucs4(host, part_len,
+ if ((error = idna__utf8_to_ucs4(host, label_len,
&ucs4_host, &ucs4_len)) != NSERROR_OK)
return error;
@@ -541,31 +541,30 @@ nserror idna_encode(const char *host, size_t len, char **ace_host, size_t *ace_l
fqdn_len += output_len;
} else {
/* This is already a DNS-valid ASCII string */
- if ((idna__is_ace(host, part_len) == true) &&
- (idna__verify(host, part_len) == false)) {
+ if ((idna__is_ace(host, label_len) == true) &&
+ (idna__verify(host, label_len) == false)) {
LOG(("Cannot verify ACE label %s", host));
return NSERROR_BAD_URL;
}
- strncpy(fqdn_p, host, part_len);
- fqdn_p += part_len;
- fqdn_len += part_len;
+ strncpy(fqdn_p, host, label_len);
+ fqdn_p += label_len;
+ fqdn_len += label_len;
}
*fqdn_p = '.';
fqdn_p++;
fqdn_len++;
- host += part_len;
+ host += label_len;
if ((*host == '\0') || (*host == ':')) break;
host++;
- len = len - part_len - 1;
+ len = len - label_len - 1;
}
fqdn_p--;
*fqdn_p = '\0';
*ace_host = strdup(fqdn);
*ace_len = fqdn_len - 1; /* last character is NULL */
- LOG(("Punycode FQDN >> %s", *ace_host));
return NSERROR_OK;
}
@@ -576,16 +575,16 @@ nserror idna_decode(const char *ace_host, size_t ace_len, char **host, size_t *h
{
nserror error;
int32_t *ucs4_host;
- size_t part_len, output_len, ucs4_len, fqdn_len = 0;
+ size_t label_len, output_len, ucs4_len, fqdn_len = 0;
char fqdn[256];
char *output, *fqdn_p = fqdn;
- while ((part_len = idna__host_part_length(ace_host, ace_len)) != 0) {
- if (idna__is_ace(ace_host, part_len) == true) {
+ while ((label_len = idna__host_label_length(ace_host, ace_len)) != 0) {
+ if (idna__is_ace(ace_host, label_len) == true) {
/* This string is DNS-valid and (probably) encoded */
/* Decode to Unicode */
- error = idna__ace_to_ucs4(ace_host, part_len,
+ error = idna__ace_to_ucs4(ace_host, label_len,
&ucs4_host, &ucs4_len);
if (error != NSERROR_OK) return error;
@@ -601,26 +600,26 @@ nserror idna_decode(const char *ace_host, size_t ace_len, char **host, size_t *h
fqdn_len += output_len;
} else {
/* Not ACE */
- memcpy(fqdn_p, ace_host, part_len);
- fqdn_p += part_len;
- fqdn_len += part_len;
+ memcpy(fqdn_p, ace_host, label_len);
+ fqdn_p += label_len;
+ fqdn_len += label_len;
}
*fqdn_p = '.';
fqdn_p++;
fqdn_len++;
- ace_host += part_len;
+ ace_host += label_len;
if ((*ace_host == '\0') || (*ace_host == ':')) break;
ace_host++;
- ace_len = ace_len - part_len - 1;
+ ace_len = ace_len - label_len - 1;
}
fqdn_p--;
*fqdn_p = '\0';
*host = strdup(fqdn);
*host_len = fqdn_len - 1; /* last character is NULL */
- LOG(("Decoded FQDN >> %s", *host));
+
return NSERROR_OK;
}
--
NetSurf Browser
9 years, 8 months
- 1
- 0