Skip to content

Commit b31370a

Browse files
committed
Fix build with newer gcc plus upgrade to 1.0.14
1 parent cc63cec commit b31370a

File tree

6 files changed

+4
-19
lines changed

6 files changed

+4
-19
lines changed

Diff for: debian/rules

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ CFLAGS = -Wall -g
44

55
FLAVOURS:=hs-httpgateway hs-archive
66

7-
NGINX_VERSION = 1.0.5
7+
NGINX_VERSION = 1.0.14
88
BUILDDIR_hs-httpgateway = $(CURDIR)/debian/build-hs-httpgateway
99
BUILDDIR_hs-archive = $(CURDIR)/debian/build-hs-archive
1010
MODULESDIR = $(CURDIR)/modules

Diff for: modules/ngx_http_virtualssl/nginx-virtualssl.patch

+3-1
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,13 @@ index 2cef4fa..e39b127 100644
3737

3838

3939
static char *ngx_http_client_errors[] = {
40-
@@ -637,6 +640,7 @@ ngx_http_ssl_servername(ngx_ssl_conn_t *ssl_conn, int *ad, void *arg)
40+
@@ -637,6 +642,9 @@ ngx_http_ssl_servername(ngx_ssl_conn_t *ssl_conn, int *ad, void *arg)
4141
ngx_connection_t *c;
4242
ngx_http_request_t *r;
4343
ngx_http_ssl_srv_conf_t *sscf;
44+
+#if (NGX_HTTP_VIRTUALSSL)
4445
+ int ret;
46+
+#endif
4547

4648
servername = SSL_get_servername(ssl_conn, TLSEXT_NAMETYPE_host_name);
4749

Diff for: nginx-1.0.14.tar.gz

676 KB
Binary file not shown.

Diff for: nginx-1.0.5.tar.gz

-647 KB
Binary file not shown.

Diff for: patches/hs-copyright.diff

-16
This file was deleted.

Diff for: patches/series

-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
hs-copyright.diff
21
nginx-preconnect.patch
32
nginx-virtualssl.patch

0 commit comments

Comments
 (0)