parent
b314430118
commit
2e0e767f93
|
@ -1 +1 @@
|
||||||
cf80d75a9625c6d11ede200b7ee1cccffb16d5b0
|
33ef60a93420294641033417ab35d36d76372c93
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
LIGHTTPD_MAIN := 1
|
LIGHTTPD_MAIN := 1
|
||||||
LIGHTTPD_MAJOR := 4
|
LIGHTTPD_MAJOR := 4
|
||||||
LIGHTTPD_MINOR := 31
|
LIGHTTPD_MINOR := 38
|
||||||
LIGHTTPD_VERSION := $(LIGHTTPD_MAIN).$(LIGHTTPD_MAJOR).$(LIGHTTPD_MINOR)
|
LIGHTTPD_VERSION := $(LIGHTTPD_MAIN).$(LIGHTTPD_MAJOR).$(LIGHTTPD_MINOR)
|
||||||
LIGHTTPD := lighttpd-$(LIGHTTPD_VERSION)
|
LIGHTTPD := lighttpd-$(LIGHTTPD_VERSION)
|
||||||
|
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
LICENSE := BSD
|
LICENSE := BSD
|
||||||
VERSION := 1.4.31
|
VERSION := 1.4.38
|
||||||
DOWNLOADS := lighttpd.archive
|
DOWNLOADS := lighttpd.archive
|
||||||
|
|
||||||
URL(lighttpd) := http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-$(VERSION).tar.gz
|
URL(lighttpd) := http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-$(VERSION).tar.gz
|
||||||
SHA(lighttpd) := 6b3babc9df173cea5ae4756c2fd6b0e85e015f2a
|
SHA(lighttpd) := c5333bafa266b3cb99c36f2f84dd50139c7aec14
|
||||||
SIG(lighttpd) := ${URL(lighttpd)}.asc
|
SIG(lighttpd) := ${URL(lighttpd)}.asc
|
||||||
KEY(lighttpd) := stbuehler@lighttpd.net
|
KEY(lighttpd) := stbuehler@lighttpd.net
|
||||||
DIR(lighttpd) := src/app/lighttpd
|
DIR(lighttpd) := src/app/lighttpd
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
|
|
||||||
return -1;
|
return -1;
|
||||||
+++ src/app/lighttpd/src/http-header-glue.c
|
+++ src/app/lighttpd/src/http-header-glue.c
|
||||||
@@ -175,6 +175,7 @@ int http_response_redirect_to_directory(server *srv, connection *con) {
|
@@ -172,6 +172,7 @@ int http_response_redirect_to_directory(server *srv, connection *con) {
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
case AF_INET:
|
case AF_INET:
|
||||||
|
@ -17,7 +17,7 @@
|
||||||
if (NULL == (he = gethostbyaddr((char *)&our_addr.ipv4.sin_addr, sizeof(struct in_addr), AF_INET))) {
|
if (NULL == (he = gethostbyaddr((char *)&our_addr.ipv4.sin_addr, sizeof(struct in_addr), AF_INET))) {
|
||||||
log_error_write(srv, __FILE__, __LINE__,
|
log_error_write(srv, __FILE__, __LINE__,
|
||||||
"SdS", "NOTICE: gethostbyaddr failed: ",
|
"SdS", "NOTICE: gethostbyaddr failed: ",
|
||||||
@@ -184,6 +185,8 @@ int http_response_redirect_to_directory(server *srv, connection *con) {
|
@@ -181,6 +182,8 @@ int http_response_redirect_to_directory(server *srv, connection *con) {
|
||||||
} else {
|
} else {
|
||||||
buffer_append_string(o, he->h_name);
|
buffer_append_string(o, he->h_name);
|
||||||
}
|
}
|
||||||
|
@ -27,7 +27,7 @@
|
||||||
default:
|
default:
|
||||||
log_error_write(srv, __FILE__, __LINE__,
|
log_error_write(srv, __FILE__, __LINE__,
|
||||||
+++ src/app/lighttpd/src/network.c
|
+++ src/app/lighttpd/src/network.c
|
||||||
@@ -301,6 +301,7 @@ static int network_server_init(server *srv, buffer *host_token, specific_config
|
@@ -323,6 +323,7 @@ static int network_server_init(server *srv, buffer *host_token, specific_config
|
||||||
if (host == NULL) {
|
if (host == NULL) {
|
||||||
srv_socket->addr.ipv4.sin_addr.s_addr = htonl(INADDR_ANY);
|
srv_socket->addr.ipv4.sin_addr.s_addr = htonl(INADDR_ANY);
|
||||||
} else {
|
} else {
|
||||||
|
@ -35,7 +35,7 @@
|
||||||
struct hostent *he;
|
struct hostent *he;
|
||||||
if (NULL == (he = gethostbyname(host))) {
|
if (NULL == (he = gethostbyname(host))) {
|
||||||
log_error_write(srv, __FILE__, __LINE__,
|
log_error_write(srv, __FILE__, __LINE__,
|
||||||
@@ -320,6 +321,7 @@ static int network_server_init(server *srv, buffer *host_token, specific_config
|
@@ -342,6 +343,7 @@ static int network_server_init(server *srv, buffer *host_token, specific_config
|
||||||
}
|
}
|
||||||
|
|
||||||
memcpy(&(srv_socket->addr.ipv4.sin_addr.s_addr), he->h_addr_list[0], he->h_length);
|
memcpy(&(srv_socket->addr.ipv4.sin_addr.s_addr), he->h_addr_list[0], he->h_length);
|
||||||
|
@ -44,28 +44,32 @@
|
||||||
srv_socket->addr.ipv4.sin_port = htons(port);
|
srv_socket->addr.ipv4.sin_port = htons(port);
|
||||||
|
|
||||||
+++ src/app/lighttpd/src/fdevent.c
|
+++ src/app/lighttpd/src/fdevent.c
|
||||||
@@ -198,16 +198,23 @@ void * fdevent_get_context(fdevents *ev, int fd) {
|
@@ -201,15 +201,18 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
void fd_close_on_exec(int fd) {
|
||||||
|
+#if 0
|
||||||
|
#ifdef FD_CLOEXEC
|
||||||
|
if (fd < 0) return;
|
||||||
|
force_assert(-1 != fcntl(fd, F_SETFD, FD_CLOEXEC));
|
||||||
|
#else
|
||||||
|
UNUSED(fd);
|
||||||
|
#endif
|
||||||
|
+#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
int fdevent_fcntl_set(fdevents *ev, int fd) {
|
int fdevent_fcntl_set(fdevents *ev, int fd) {
|
||||||
+#if 0
|
+#if 0
|
||||||
#ifdef FD_CLOEXEC
|
fd_close_on_exec(fd);
|
||||||
/* close fd on exec (cgi) */
|
if ((ev) && (ev->fcntl_set)) return ev->fcntl_set(ev, fd);
|
||||||
fcntl(fd, F_SETFD, FD_CLOEXEC);
|
|
||||||
#endif
|
|
||||||
- if ((ev) && (ev->fcntl_set)) return ev->fcntl_set(ev, fd);
|
|
||||||
+ if ((ev) && (ev->fcntl_set)){
|
|
||||||
+ fprintf(stderr, "call ev->fcntl_set(ev, %d)\n", fd);
|
|
||||||
+ return ev->fcntl_set(ev, fd);
|
|
||||||
+ }
|
|
||||||
#ifdef O_NONBLOCK
|
#ifdef O_NONBLOCK
|
||||||
+ fprintf(stderr, "call fcntl(ev, %d)\n", fd);
|
@@ -217,6 +220,9 @@
|
||||||
return fcntl(fd, F_SETFL, O_NONBLOCK | O_RDWR);
|
|
||||||
#else
|
#else
|
||||||
return 0;
|
return 0;
|
||||||
#endif
|
#endif
|
||||||
+#endif
|
+#else
|
||||||
+ return 0;
|
+ return 0;
|
||||||
|
+#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,7 @@ LIGHTTPD_MAJOR := $(word 2,$(LIGHTTPD_VERSION))
|
||||||
LIGHTTPD_MINOR := $(word 3,$(LIGHTTPD_VERSION))
|
LIGHTTPD_MINOR := $(word 3,$(LIGHTTPD_VERSION))
|
||||||
|
|
||||||
CC_OPT += -DHAVE_SOCKLEN_T -DHAVE_SYSLOG_H -DHAVE_STDINT_H -DUSE_POLL
|
CC_OPT += -DHAVE_SOCKLEN_T -DHAVE_SYSLOG_H -DHAVE_STDINT_H -DUSE_POLL
|
||||||
CC_OPT += -DHAVE_SYS_WAIT_H -DHAVE_SYS_UN_H -DHAVE_MMAP -DHAVE_SELECT
|
CC_OPT += -DHAVE_SYS_WAIT_H -DHAVE_SYS_UN_H -DHAVE_MMAP -DHAVE_SYS_MMAN_H -DHAVE_SELECT
|
||||||
CC_OPT += -DHAVE_WRITEV -DUSE_WRITEV
|
CC_OPT += -DHAVE_WRITEV -DUSE_WRITEV
|
||||||
CC_OPT += -DSBIN_DIR="\"/sbin\""
|
CC_OPT += -DSBIN_DIR="\"/sbin\""
|
||||||
CC_OPT += -DPACKAGE_NAME="\"lighttpd\""
|
CC_OPT += -DPACKAGE_NAME="\"lighttpd\""
|
||||||
|
|
Loading…
Reference in New Issue
Block a user