Author: glen Date: Tue Jul 18 14:36:54 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- r1202
---- Files affected:
SOURCES:
lighttpd-branch.diff (1.7 -> 1.8)
---- Diffs:
================================================================
Index: SOURCES/lighttpd-branch.diff
diff -u SOURCES/lighttpd-branch.diff:1.7 SOURCES/lighttpd-branch.diff:1.8
--- SOURCES/lighttpd-branch.diff:1.7 Tue Jul 18 12:05:14 2006
+++ SOURCES/lighttpd-branch.diff Tue Jul 18 16:36:48 2006
@@ -796,7 +796,7 @@
LIGHTTPD_DIR=$(BUILD_DIR)/$(LIGHTTPD)
LIGHTTPD_IPK=$(BUILD_DIR)/$(LIGHTTPD)_mipsel.ipk
--- ../lighttpd-1.4.11/src/Makefile.am 2006-03-07 14:20:20.000000000 +0200
-+++ lighttpd-1.4.12/src/Makefile.am 2006-07-18 13:03:40.000000000 +0300
++++ lighttpd-1.4.12/src/Makefile.am 2006-07-18 17:34:32.000000000 +0300
@@ -16,18 +16,24 @@
else
configparser.y: lemon
@@ -864,21 +864,22 @@
lib_LTLIBRARIES += mod_cgi.la
mod_cgi_la_SOURCES = mod_cgi.c
mod_cgi_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
-@@ -158,6 +169,13 @@
+@@ -158,6 +169,14 @@
mod_proxy_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
mod_proxy_la_LIBADD = $(common_libadd)
+lib_LTLIBRARIES += mod_proxy_core.la
+mod_proxy_core_la_SOURCES = mod_proxy_core.c mod_proxy_core_pool.c \
-+ mod_proxy_core_backend.c mod_proxy_core_address.c
mod_proxy_core_backlog.c
++ mod_proxy_core_backend.c mod_proxy_core_address.c \
++ mod_proxy_core_backlog.c mod_proxy_core_rewrites.c
+mod_proxy_core_la_LDFLAGS = -module -export-dynamic -avoid-version
-no-undefined
-+mod_proxy_core_la_LIBADD = $(common_libadd)
++mod_proxy_core_la_LIBADD = $(common_libadd) $(PCRE_LIB)
+
+
lib_LTLIBRARIES += mod_ssi.la
mod_ssi_la_SOURCES = mod_ssi_exprparser.c mod_ssi_expr.c mod_ssi.c
mod_ssi_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
-@@ -240,7 +258,12 @@
+@@ -240,7 +259,12 @@
mod_ssi.h mod_ssi_expr.h inet_ntop_cache.h \
configparser.h mod_ssi_exprparser.h \
sys-mmap.h sys-socket.h mod_cml.h mod_cml_funcs.h \
@@ -888,11 +889,11 @@
+ iosocket.h array-static.h \
+ mod_proxy_core_address.h mod_proxy_core_backend.h \
+ mod_proxy_core_backlog.h mod_proxy_core.h \
-+ mod_proxy_core_pool.h
++ mod_proxy_core_pool.h mod_proxy_core_rewrites.h
DEFS= @DEFS@ -DLIBRARY_DIR="\"$(libdir)\""
-@@ -267,4 +290,4 @@
+@@ -267,4 +291,4 @@
#ajp_SOURCES = ajp.c
noinst_HEADERS = $(hdr)
@@ -16642,7 +16643,7 @@
return 0;
}
--- ../lighttpd-1.4.11/src/mod_cgi.c 2006-02-22 15:15:10.000000000 +0200
-+++ lighttpd-1.4.12/src/mod_cgi.c 2006-07-18 13:03:40.000000000 +0300
++++ lighttpd-1.4.12/src/mod_cgi.c 2006-07-18 17:34:32.000000000 +0300
@@ -1,21 +1,8 @@
#include <sys/types.h>
-#ifdef __WIN32
@@ -16896,7 +16897,7 @@
if (r->size == 0) {
r->size = 16;
r->ptr = malloc(sizeof(*r->ptr) * r->size);
-@@ -194,321 +201,178 @@
+@@ -194,321 +201,179 @@
r->size += 16;
r->ptr = realloc(r->ptr, sizeof(*r->ptr) * r->size);
}
@@ -17334,6 +17335,7 @@
- cgi_handler_ctx_free(hctx);
-
+ cgi_session_free(sess);
++ sess = NULL;
+
/* if waitpid hasn't been called by response.c yet, do it here */
if (pid) {
@@ -17342,7 +17344,7 @@
switch(waitpid(pid, &status, WNOHANG)) {
case 0:
/* not finished yet */
-@@ -519,35 +383,35 @@
+@@ -519,35 +384,35 @@
case -1:
/* */
if (errno == EINTR) break;
@@ -17387,7 +17389,7 @@
return HANDLER_GO_ON;
} else {
log_error_write(srv, __FILE__, __LINE__, "sd",
"cgi died, pid:", pid);
-@@ -555,122 +419,126 @@
+@@ -555,122 +420,126 @@
return HANDLER_GO_ON;
}
}
@@ -17587,7 +17589,7 @@
if (env->size == 0) {
env->size = 16;
env->ptr = malloc(env->size * sizeof(*env->ptr));
-@@ -678,45 +546,45 @@
+@@ -678,45 +547,45 @@
env->size += 16;
env->ptr = realloc(env->ptr, env->size * sizeof(*env->ptr));
}
@@ -17644,7 +17646,7 @@
/* fork, execve */
switch (pid = fork()) {
case 0: {
-@@ -730,44 +598,40 @@
+@@ -730,44 +599,40 @@
char *c;
const char *s;
server_socket *srv_sock = con->srv_socket;
@@ -17700,14 +17702,12 @@
(const void *)
&(srv_sock->addr.ipv6.sin6_addr) :
(const void *)
&(srv_sock->addr.ipv4.sin_addr),
b2, sizeof(b2)-1);
-@@ -779,10 +643,12 @@
+@@ -779,10 +644,10 @@
cgi_env_add(&env, CONST_STR_LEN("GATEWAY_INTERFACE"),
CONST_STR_LEN("CGI/1.1"));
s = get_http_version_name(con->request.http_version);
-
+
-+ TRACE("http-version: %s (%d)", s, con->request.http_version);
-+
cgi_env_add(&env, CONST_STR_LEN("SERVER_PROTOCOL"), s,
strlen(s));
-
- ltostr(buf,
@@ -17716,7 +17716,7 @@
#ifdef HAVE_IPV6
ntohs(srv_sock->addr.plain.sa_family == AF_INET6 ?
srv_sock->addr.ipv6.sin6_port : srv_sock->addr.ipv4.sin_port)
#else
-@@ -790,10 +656,10 @@
+@@ -790,10 +655,10 @@
#endif
);
cgi_env_add(&env, CONST_STR_LEN("SERVER_PORT"), buf,
strlen(buf));
@@ -17730,7 +17730,7 @@
(const void *) &(srv_sock->addr.ipv6.sin6_addr) :
(const void *) &(srv_sock->addr.ipv4.sin_addr),
b2, sizeof(b2)-1);
-@@ -811,15 +677,18 @@
+@@ -811,15 +676,18 @@
cgi_env_add(&env, CONST_STR_LEN("REDIRECT_STATUS"),
CONST_STR_LEN("200"));
if (!buffer_is_empty(con->uri.query)) {
cgi_env_add(&env, CONST_STR_LEN("QUERY_STRING"),
CONST_BUF_LEN(con->uri.query));
@@ -17753,7 +17753,7 @@
(const void *) &(con->dst_addr.ipv6.sin6_addr) :
(const void *) &(con->dst_addr.ipv4.sin_addr),
b2, sizeof(b2)-1);
-@@ -828,7 +697,7 @@
+@@ -828,7 +696,7 @@
#endif
cgi_env_add(&env, CONST_STR_LEN("REMOTE_ADDR"), s, strlen(s));
@@ -17762,7 +17762,7 @@
#ifdef HAVE_IPV6
ntohs(con->dst_addr.plain.sa_family == AF_INET6 ?
con->dst_addr.ipv6.sin6_port : con->dst_addr.ipv4.sin_port)
#else
-@@ -836,19 +705,19 @@
+@@ -836,19 +704,19 @@
#endif
);
cgi_env_add(&env, CONST_STR_LEN("REMOTE_PORT"), buf,
strlen(buf));
@@ -17785,7 +17785,7 @@
/* for valgrind */
if (NULL != (s = getenv("LD_PRELOAD"))) {
cgi_env_add(&env, CONST_STR_LEN("LD_PRELOAD"), s,
strlen(s));
-@@ -863,24 +732,24 @@
+@@ -863,24 +731,24 @@
cgi_env_add(&env, CONST_STR_LEN("SYSTEMROOT"), s,
strlen(s));
}
#endif
@@ -17817,7 +17817,7 @@
for (j = 0; j < ds->key->used - 1; j++) {
char cr = '_';
if (light_isalpha(ds->key->ptr[j])) {
-@@ -893,46 +762,46 @@
+@@ -893,46 +761,46 @@
p->tmp_buf->ptr[p->tmp_buf->used++] =
cr;
}
p->tmp_buf->ptr[p->tmp_buf->used++] = '\0';
@@ -17878,7 +17878,7 @@
if (cgi_handler->used > 1) {
args[i++] = cgi_handler->ptr;
}
-@@ -942,7 +811,7 @@
+@@ -942,7 +810,7 @@
/* search for the last / */
if (NULL != (c = strrchr(con->physical.path->ptr, '/'))) {
*c = '\0';
@@ -17887,7 +17887,7 @@
/* change to the physical directory */
if (-1 == chdir(con->physical.path->ptr)) {
log_error_write(srv, __FILE__, __LINE__, "ssb",
"chdir failed:", strerror(errno), con->physical.path);
-@@ -952,14 +821,14 @@
+@@ -952,14 +820,14 @@
/* we don't need the client socket */
for (i = 3; i < 256; i++) {
@@ -17906,7 +17906,7 @@
/* */
SEGFAULT();
break;
-@@ -969,16 +838,16 @@
+@@ -969,16 +837,16 @@
log_error_write(srv, __FILE__, __LINE__, "ss", "fork failed:",
strerror(errno));
break;
default: {
@@ -17926,7 +17926,7 @@
assert(chunkqueue_length(cq) ==
(off_t)con->request.content_length);
/* there is content to send */
-@@ -993,16 +862,16 @@
+@@ -993,16 +861,16 @@
if (-1 == c->file.fd && /*
open the file if not already open */
-1 == (c->file.fd =
open(c->file.name->ptr, O_RDONLY))) {
log_error_write(srv,
__FILE__, __LINE__, "ss", "open failed: ", strerror(errno));
@@ -17946,7 +17946,7 @@
strerror(errno), c->file.name, c->file.fd);
close(from_cgi_fds[0]);
-@@ -1012,7 +881,7 @@
+@@ -1012,7 +880,7 @@
close(c->file.fd);
c->file.fd = -1;
@@ -17955,7 +17955,7 @@
/* chunk_reset() or
chunk_free() will cleanup for us */
}
-@@ -1020,7 +889,7 @@
+@@ -1020,7 +888,7 @@
switch(errno) {
case ENOSPC:
con->http_status = 507;
@@ -17964,7 +17964,7 @@
break;
default:
con->http_status = 403;
-@@ -1033,7 +902,7 @@
+@@ -1033,7 +901,7 @@
switch(errno) {
case ENOSPC:
con->http_status = 507;
@@ -17973,7 +17973,7 @@
break;
default:
con->http_status = 403;
-@@ -1056,103 +925,95 @@
+@@ -1056,103 +924,95 @@
}
close(to_cgi_fds[1]);
@@ -18003,6 +18003,8 @@
+ sess->remote_con = con;
+ sess->pid = pid;
+
++ assert(sess->sock);
++
+ sess->sock->fd = from_cgi_fds[0];
+ sess->sock->type = IOSOCKET_TYPE_PIPE;
+
@@ -18092,8 +18094,6 @@
if (fn->used == 0) return HANDLER_GO_ON;
-
+
-+ TRACE("http-version: (%d)", con->request.http_version);
-+
mod_cgi_patch_connection(srv, con, p);
-
+
@@ -18117,7 +18117,7 @@
buffer_reset(con->physical.path);
return HANDLER_FINISHED;
}
-@@ -1160,7 +1021,7 @@
+@@ -1160,7 +1020,7 @@
break;
}
}
@@ -18126,7 +18126,7 @@
return HANDLER_GO_ON;
}
-@@ -1168,11 +1029,11 @@
+@@ -1168,11 +1028,11 @@
plugin_data *p = p_d;
size_t ndx;
/* the trigger handle only cares about lonely PID which we have to wait
for */
@@ -18140,7 +18140,7 @@
switch(waitpid(p->cgi_pid.ptr[ndx], &status, WNOHANG)) {
case 0:
/* not finished yet */
-@@ -1182,7 +1043,7 @@
+@@ -1182,7 +1042,7 @@
break;
case -1:
log_error_write(srv, __FILE__, __LINE__, "ss", "waitpid
failed: ", strerror(errno));
@@ -18149,7 +18149,7 @@
return HANDLER_ERROR;
default:
-@@ -1193,96 +1054,103 @@
+@@ -1193,96 +1053,105 @@
} else {
log_error_write(srv, __FILE__, __LINE__, "s",
"cgi died ?");
}
@@ -18256,6 +18256,7 @@
+ fdevent_unregister(srv->ev, sess->sock);
+
+ cgi_session_free(sess);
++ sess = NULL;
+
con->plugin_ctx[p->id] = NULL;
-
@@ -18301,11 +18302,12 @@
+ fdevent_unregister(srv->ev, sess->sock);
+
+ cgi_session_free(sess);
++ sess = NULL;
+
con->plugin_ctx[p->id] = NULL;
return HANDLER_FINISHED;
}
-@@ -1306,8 +1174,8 @@
+@@ -1306,8 +1175,8 @@
p->init = mod_cgi_init;
p->cleanup = mod_cgi_free;
p->set_defaults = mod_fastcgi_set_defaults;
@@ -28776,12 +28778,13 @@
return 0;
}
--- ../lighttpd-1.4.11/src/mod_proxy_core.c 1970-01-01 03:00:00.000000000
+0300
-+++ lighttpd-1.4.12/src/mod_proxy_core.c 2006-07-18 13:03:40.000000000
+0300
-@@ -0,0 +1,1451 @@
++++ lighttpd-1.4.12/src/mod_proxy_core.c 2006-07-18 17:34:32.000000000
+0300
+@@ -0,0 +1,1709 @@
+#include <string.h>
+#include <stdlib.h>
+#include <fcntl.h>
+#include <errno.h>
++#include <ctype.h>
+
+#include "buffer.h"
+#include "array.h"
@@ -28799,6 +28802,10 @@
+#include "mod_proxy_core_pool.h"
+#include "mod_proxy_core_backend.h"
+#include "mod_proxy_core_backlog.h"
++#include "mod_proxy_core_rewrites.h"
++
++#define CONFIG_PROXY_CORE_REWRITE_REQUEST "proxy-core.rewrite-request"
++#define CONFIG_PROXY_CORE_REWRITE_RESPONSE "proxy-core.rewrite-response"
+
+typedef enum {
+ PROXY_PROTOCOL_UNSET,
@@ -28813,6 +28820,9 @@
+
+ proxy_backlog *backlog;
+
++ proxy_rewrites *request_rewrites;
++ proxy_rewrites *response_rewrites;
++
+ int debug;
+
+ proxy_balance_t balancer;
@@ -28832,6 +28842,8 @@
+ buffer *protocol_buf;
+ buffer *balance_buf;
+
++ buffer *replace_buf;
++
+ plugin_config **config_storage;
+
+ plugin_config conf;
@@ -28871,6 +28883,7 @@
+
+ p->balance_buf = buffer_init();
+ p->protocol_buf = buffer_init();
++ p->replace_buf = buffer_init();
+ p->backends_arr = array_init();
+
+ p->resp = http_response_init();
@@ -28905,6 +28918,7 @@
+
+ buffer_free(p->balance_buf);
+ buffer_free(p->protocol_buf);
++ buffer_free(p->replace_buf);
+
+ http_response_free(p->resp);
+
@@ -28913,6 +28927,87 @@
+ return HANDLER_GO_ON;
+}
+
++static handler_t mod_proxy_core_config_parse_rewrites(proxy_rewrites *dest,
array *src, const char *config_key) {
++ data_unset *du;
++ size_t j;
++
++ if (NULL != (du = array_get_element(src, config_key))) {
++ data_array *keys = (data_array *)du;
++
++ if (keys->type != TYPE_ARRAY) {
++ ERROR("%s = <...>",
++ config_key);
++
++ return HANDLER_ERROR;
++ }
++
++ /*
++ * proxy-core.rewrite-request = (
++ * "_uri" => ( ... )
++ * )
++ */
++
++ for (j = 0; j < keys->value->used; j++) {
++ size_t k;
++ data_array *headers = (data_array
*)keys->value->data[j];
++
++ /* keys->key should be "_uri" and the value a array of
rewrite */
++ if (headers->type != TYPE_ARRAY) {
++ ERROR("%s = ( %s => <...> ) has to a array",
++ config_key,
++ BUF_STR(headers->key));
++
++ return HANDLER_ERROR;
++ }
++
++ TRACE("%s: header-field: %s", config_key,
BUF_STR(headers->key));
++
++ if (headers->value->used > 1) {
++ ERROR("%s = ( %s => <...> ) has to a array with
only one element",
++ config_key,
++ BUF_STR(headers->key));
++
++ return HANDLER_ERROR;
++
++ }
++
++ for (k = 0; k < headers->value->used; k++) {
++ data_string *rewrites = (data_string
*)headers->value->data[k];
++ proxy_rewrite *rw;
++
++ /* keys->key should be "_uri" and the value a
array of rewrite */
++ if (rewrites->type != TYPE_STRING) {
++ ERROR("%s = ( \"%s\" => ( \"%s\" =>
<value> ) ) has to a string",
++ config_key,
++ BUF_STR(headers->key),
++ BUF_STR(rewrites->key));
++
++ return HANDLER_ERROR;
++ }
++
++ TRACE("%s: rewrites-field: %s -> %s",
++ config_key,
++ BUF_STR(headers->key),
++ BUF_STR(rewrites->key));
++
++ rw = proxy_rewrite_init();
++
++ if (0 != proxy_rewrite_set_regex(rw,
rewrites->key)) {
++ return HANDLER_ERROR;
++ }
++ buffer_copy_string_buffer(rw->replace,
rewrites->value);
++ buffer_copy_string_buffer(rw->match,
rewrites->key);
++ buffer_copy_string_buffer(rw->header,
headers->key);
++
++ proxy_rewrites_add(dest, rw);
++ }
++ }
++ }
++
++ return HANDLER_GO_ON;
++}
++
++
+SETDEFAULTS_FUNC(mod_proxy_core_set_defaults) {
+ plugin_data *p = p_d;
+ size_t i, j;
@@ -28922,6 +29017,8 @@
+ { "proxy-core.debug", NULL, T_CONFIG_SHORT,
T_CONFIG_SCOPE_CONNECTION }, /* 1 */
+ { "proxy-core.balancer", NULL, T_CONFIG_STRING,
T_CONFIG_SCOPE_CONNECTION }, /* 2 */
+ { "proxy-core.protocol", NULL, T_CONFIG_STRING,
T_CONFIG_SCOPE_CONNECTION }, /* 3 */
++ { CONFIG_PROXY_CORE_REWRITE_REQUEST, NULL, T_CONFIG_LOCAL,
T_CONFIG_SCOPE_CONNECTION }, /* 4 */
++ { CONFIG_PROXY_CORE_REWRITE_RESPONSE, NULL, T_CONFIG_LOCAL,
T_CONFIG_SCOPE_CONNECTION },/* 5 */
+ { NULL, NULL, T_CONFIG_UNSET,
T_CONFIG_SCOPE_UNSET }
+ };
+
@@ -28942,6 +29039,8 @@
+ s->protocol = PROXY_PROTOCOL_UNSET;
+ s->backends = proxy_backends_init();
+ s->backlog = proxy_backlog_init();
++ s->response_rewrites = proxy_rewrites_init();
++ s->request_rewrites = proxy_rewrites_init();
+
+ cv[0].destination = p->backends_arr;
+ cv[1].destination = &(s->debug);
@@ -28981,19 +29080,29 @@
+ s->protocol = di->value;
+ }
+
-+ backend = proxy_backend_init();
++ if (p->backends_arr->used) {
++ backend = proxy_backend_init();
+
-+ /* check if the backends have a valid host-name */
-+ for (j = 0; j < p->backends_arr->used; j++) {
-+ data_string *ds = (data_string
*)p->backends_arr->data[j];
++ /* check if the backends have a valid host-name */
++ for (j = 0; j < p->backends_arr->used; j++) {
++ data_string *ds = (data_string
*)p->backends_arr->data[j];
+
-+ /* the values should be ips or hostnames */
-+ if (0 !=
proxy_address_pool_add_string(backend->address_pool, ds->value)) {
-+ return HANDLER_ERROR;
++ /* the values should be ips or hostnames */
++ if (0 !=
proxy_address_pool_add_string(backend->address_pool, ds->value)) {
++ return HANDLER_ERROR;
++ }
+ }
++
++ proxy_backends_add(s->backends, backend);
+ }
+
-+ proxy_backends_add(s->backends, backend);
++ if (HANDLER_GO_ON !=
mod_proxy_core_config_parse_rewrites(s->request_rewrites, ca,
CONFIG_PROXY_CORE_REWRITE_REQUEST)) {
++ return HANDLER_ERROR;
++ }
++
++ if (HANDLER_GO_ON !=
mod_proxy_core_config_parse_rewrites(s->response_rewrites, ca,
CONFIG_PROXY_CORE_REWRITE_RESPONSE)) {
++ return HANDLER_ERROR;
++ }
+ }
+
+ return HANDLER_GO_ON;
@@ -29252,8 +29361,6 @@
+ } else {
+ /* no chunked encoding, ok, perhaps a content-length ? */
+
-+ TRACE("content-lenght: %d", sess->content_length);
-+
+ chunkqueue_remove_finished_chunks(raw);
+ for (c = raw->first; c; c = c->next) {
+ buffer *b;
@@ -29389,23 +29496,107 @@
+ return HANDLER_GO_ON;
+}
+
++int pcre_replace(pcre *match, buffer *replace, buffer *match_buf, buffer
*result) {
++ const char *pattern = replace->ptr;
++ size_t pattern_len = replace->used - 1;
++
++# define N 10
++ int ovec[N * 3];
++ int n;
++
++ if ((n = pcre_exec(match, NULL, match_buf->ptr, match_buf->used - 1, 0,
0, ovec, 3 * N)) < 0) {
++ if (n != PCRE_ERROR_NOMATCH) {
++ return n;
++ }
++ } else {
++ const char **list;
++ size_t start, end;
++ size_t k;
++
++ /* it matched */
++ pcre_get_substring_list(match_buf->ptr, ovec, n, &list);
++
++ /* search for $[0-9] */
++
++ buffer_reset(result);
++
++ start = 0; end = pattern_len;
++ for (k = 0; k < pattern_len; k++) {
++ if ((pattern[k] == '$') &&
++ isdigit((unsigned char)pattern[k + 1])) {
++ /* got one */
++
++ size_t num = pattern[k + 1] - '0';
++
++ end = k;
++
++ buffer_append_string_len(result, pattern +
start, end - start);
++
++ /* n is always > 0 */
++ if (num < (size_t)n) {
++ buffer_append_string(result, list[num]);
++ }
++
++ k++;
++ start = k + 1;
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/lighttpd-branch.diff?r1=1.7&r2=1.8&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
