Patchwork [2/2] hiawatha: fix bug #5276 and bump to version 8.4

login
register
mail settings
Submitter Gustavo Zacarias
Date June 11, 2012, 8:40 p.m.
Message ID <1339447247-7801-2-git-send-email-gustavo@zacarias.com.ar>
Download mbox | patch
Permalink /patch/164249/
State Accepted
Commit 0c1ad3099242bb4ddc5ade87e6a8e4239d68f5cc
Headers show

Comments

Gustavo Zacarias - June 11, 2012, 8:40 p.m.
Fix bug #5276 by disabling IPv6 when the toolchain lacks it.
It builds fine even if it's enabled but it probably doesn't work fine.

Also bump to version 8.4:
* MaxServerLoad option added.
* Bugfix: invalid reverse proxy request when URL parameters are present.
* PolarSSL updated to version 1.1.4.
* Small bugfixes and improvements.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/hiawatha/hiawatha.mk |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
Peter Korsgaard - June 16, 2012, 8:16 p.m.
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:

 Gustavo> Fix bug #5276 by disabling IPv6 when the toolchain lacks it.
 Gustavo> It builds fine even if it's enabled but it probably doesn't work fine.

 Gustavo> Also bump to version 8.4:
 Gustavo> * MaxServerLoad option added.
 Gustavo> * Bugfix: invalid reverse proxy request when URL parameters are present.
 Gustavo> * PolarSSL updated to version 1.1.4.
 Gustavo> * Small bugfixes and improvements.

Committed, thanks.

Patch

diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk
index 647c1e1..941ee8d 100644
--- a/package/hiawatha/hiawatha.mk
+++ b/package/hiawatha/hiawatha.mk
@@ -1,4 +1,4 @@ 
-HIAWATHA_VERSION = 8.3
+HIAWATHA_VERSION = 8.4
 HIAWATHA_SITE = http://www.hiawatha-webserver.org/files/
 
 ifeq ($(BR2_PACKAGE_HIAWATHA_SSL),y)
@@ -7,6 +7,7 @@  HIAWATHA_DEPENDENCIES += polarssl
 endif
 
 HIAWATHA_CONF_OPT += \
+	$(if $(BR2_INET_IPV6),,-DENABLE_IPV6=OFF) \
 	-DENABLE_TOOLKIT=OFF \
 	-DENABLE_XSLT=OFF \
 	-DCONFIG_DIR=/etc/hiawatha \