From 9c3a123035c637831504e5edb334c838033369e6 Mon Sep 17 00:00:00 2001 From: "Yichun Zhang (agentzh)" Date: Sat, 3 May 2014 12:59:19 -0700 Subject: [PATCH] upgraded nginx core to 1.7.0. --- ...ginx-1.7.0-cache_lock_hang_in_subreq.patch | 22 + patches/nginx-1.7.0-cache_manager_exit.patch | 19 + patches/nginx-1.7.0-cve-2013-2070.patch | 13 + patches/nginx-1.7.0-dtrace.patch | 1126 +++++++++++++++++ ....7.0-gcc-maybe-uninitialized-warning.patch | 11 + .../nginx-1.7.0-larger_max_error_str.patch | 13 + ...inx-1.7.0-location_if_inherits_proxy.patch | 15 + .../nginx-1.7.0-log_escape_non_ascii.patch | 115 ++ patches/nginx-1.7.0-no_Werror.patch | 36 + patches/nginx-1.7.0-no_error_pages.patch | 90 ++ patches/nginx-1.7.0-no_pool.patch | 606 +++++++++ patches/nginx-1.7.0-pcre_conf_opt.patch | 26 + .../nginx-1.7.0-proxy_host_port_vars.patch | 15 + patches/nginx-1.7.0-server_header.patch | 24 + ...x-1.7.0-setting_args_invalidates_uri.patch | 44 + patches/nginx-1.7.0-upstream_pipelining.patch | 40 + util/mirror-tarballs | 9 +- util/ver | 4 +- 18 files changed, 2223 insertions(+), 5 deletions(-) create mode 100644 patches/nginx-1.7.0-cache_lock_hang_in_subreq.patch create mode 100644 patches/nginx-1.7.0-cache_manager_exit.patch create mode 100644 patches/nginx-1.7.0-cve-2013-2070.patch create mode 100644 patches/nginx-1.7.0-dtrace.patch create mode 100644 patches/nginx-1.7.0-gcc-maybe-uninitialized-warning.patch create mode 100644 patches/nginx-1.7.0-larger_max_error_str.patch create mode 100644 patches/nginx-1.7.0-location_if_inherits_proxy.patch create mode 100644 patches/nginx-1.7.0-log_escape_non_ascii.patch create mode 100644 patches/nginx-1.7.0-no_Werror.patch create mode 100644 patches/nginx-1.7.0-no_error_pages.patch create mode 100644 patches/nginx-1.7.0-no_pool.patch create mode 100644 patches/nginx-1.7.0-pcre_conf_opt.patch create mode 100644 patches/nginx-1.7.0-proxy_host_port_vars.patch create mode 100644 patches/nginx-1.7.0-server_header.patch create mode 100644 patches/nginx-1.7.0-setting_args_invalidates_uri.patch create mode 100644 patches/nginx-1.7.0-upstream_pipelining.patch diff --git a/patches/nginx-1.7.0-cache_lock_hang_in_subreq.patch b/patches/nginx-1.7.0-cache_lock_hang_in_subreq.patch new file mode 100644 index 0000000..6583742 --- /dev/null +++ b/patches/nginx-1.7.0-cache_lock_hang_in_subreq.patch @@ -0,0 +1,22 @@ +--- nginx-1.7.0/src/http/ngx_http_file_cache.c 2013-10-08 05:07:14.000000000 -0700 ++++ nginx-1.7.0-patched/src/http/ngx_http_file_cache.c 2013-10-26 14:47:56.184041728 -0700 +@@ -432,6 +432,7 @@ ngx_http_file_cache_lock_wait_handler(ng + ngx_uint_t wait; + ngx_msec_t timer; + ngx_http_cache_t *c; ++ ngx_connection_t *conn; + ngx_http_request_t *r; + ngx_http_file_cache_t *cache; + +@@ -471,7 +472,10 @@ wakeup: + + c->waiting = 0; + r->main->blocked--; +- r->connection->write->handler(r->connection->write); ++ ++ conn = r->connection; ++ r->write_event_handler(r); ++ ngx_http_run_posted_requests(conn); + } + + diff --git a/patches/nginx-1.7.0-cache_manager_exit.patch b/patches/nginx-1.7.0-cache_manager_exit.patch new file mode 100644 index 0000000..f1f81da --- /dev/null +++ b/patches/nginx-1.7.0-cache_manager_exit.patch @@ -0,0 +1,19 @@ +# HG changeset patch +# User Yichun Zhang +# Date 1383598130 28800 +# Node ID f64218e1ac963337d84092536f588b8e0d99bbaa +# Parent dea321e5c0216efccbb23e84bbce7cf3e28f130c +Cache: gracefully exit the cache manager process. + +diff -r dea321e5c021 -r f64218e1ac96 src/os/unix/ngx_process_cycle.c +--- a/src/os/unix/ngx_process_cycle.c Thu Oct 31 18:23:49 2013 +0400 ++++ b/src/os/unix/ngx_process_cycle.c Mon Nov 04 12:48:50 2013 -0800 +@@ -1335,7 +1335,7 @@ + + if (ngx_terminate || ngx_quit) { + ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, "exiting"); +- exit(0); ++ ngx_worker_process_exit(cycle); + } + + if (ngx_reopen) { diff --git a/patches/nginx-1.7.0-cve-2013-2070.patch b/patches/nginx-1.7.0-cve-2013-2070.patch new file mode 100644 index 0000000..0154107 --- /dev/null +++ b/patches/nginx-1.7.0-cve-2013-2070.patch @@ -0,0 +1,13 @@ +--- src/http/modules/ngx_http_proxy_module.c ++++ src/http/modules/ngx_http_proxy_module.c +@@ -1865,6 +1865,10 @@ data: + + } + ++ if (ctx->size < 0 || ctx->length < 0) { ++ goto invalid; ++ } ++ + return rc; + + done: diff --git a/patches/nginx-1.7.0-dtrace.patch b/patches/nginx-1.7.0-dtrace.patch new file mode 100644 index 0000000..8e34b81 --- /dev/null +++ b/patches/nginx-1.7.0-dtrace.patch @@ -0,0 +1,1126 @@ +diff --git a/README b/README +index 2f68e14..262822a 100644 +--- a/README ++++ b/README +@@ -1,3 +1,38 @@ ++This is an Nginx fork that adds dtrace USDT probes. + +-Documentation is available at http://nginx.org ++Installation: ++ ++ ./configure --with-dtrace-probes \ ++ --with-dtrace=/usr/sbin/dtrace \ ++ ... ++ make ++ make install ++ ++Usage on Linux (with systemtap): ++ ++ # make the stap-nginx script visiable in your PATH ++ export PATH=/usr/local/nginx/sbin:$PATH ++ ++ # list all the static probes available in your nginx ++ stap-nginx -L 'process("nginx").mark("*")' ++ ++ # run the test.stp file ++ stap-nginx test.stp ++ ++Sample test.stp file: ++ ++ probe begin ++ { ++ print("Tracing. Hit CTRL-C to stop.\n") ++ } ++ ++ probe process("nginx").mark("http-subrequest-start") ++ { ++ printf("uri: %s?%s\n", ngx_http_req_uri($arg1), ++ ngx_http_req_args($arg1)) ++ } ++ ++For now, only tested on Solaris 11 Express and Fedora Linux 17. ++ ++The original Nginx documentation is available at http://nginx.org + +diff --git a/auto/install b/auto/install +index 254f9bc..0252fef 100644 +--- a/auto/install ++++ b/auto/install +@@ -16,6 +16,20 @@ END + fi + + ++case ".$NGX_STAP_NGX_PATH" in ++ ./*) ++ ;; ++ ++ .) ++ NGX_STAP_NGX_PATH=$NGX_PREFIX/sbin/stap-nginx ++ ;; ++ ++ *) ++ NGX_STAP_NGX_PATH=$NGX_PREFIX/$NGX_STAP_NGX_PATH ++ ;; ++esac ++ ++ + case ".$NGX_SBIN_PATH" in + ./*) + ;; +@@ -53,6 +67,16 @@ case ".$NGX_PID_PATH" in + esac + + ++case ".$NGX_TAPSET_PREFIX" in ++ ./* | .) ++ ;; ++ ++ *) ++ NGX_TAPSET_PREFIX=$NGX_PREFIX/$NGX_TAPSET_PREFIX ++ ;; ++esac ++ ++ + case ".$NGX_ERROR_LOG_PATH" in + ./* | .) + ;; +@@ -151,6 +175,36 @@ install: $NGX_OBJS${ngx_dirsep}nginx${ngx_binext} \ + || cp -R $NGX_HTML '\$(DESTDIR)$NGX_PREFIX' + END + ++if [ $NGX_DTRACE = YES -a $DTRACE_FROM_SYSTEMTAP = YES ]; then ++ ++ ngx_tapset_srcs="$NGX_TAPSET_SRCS" ++ ++ cat << END >> $NGX_MAKEFILE ++ test -d '\$(DESTDIR)$NGX_TAPSET_PREFIX' || \ ++ mkdir -p '\$(DESTDIR)$NGX_TAPSET_PREFIX' ++END ++ ++ for ngx_tapset_src in $ngx_tapset_srcs ++ do ++ ngx_tapset_file=`basename $ngx_tapset_src` ++ ++ cat << END >> $NGX_MAKEFILE ++ ++ sed -e "s|NGX_SBIN_PATH|$NGX_SBIN_PATH|g" $ngx_long_cont \ ++ $ngx_tapset_src > '\$(DESTDIR)$NGX_TAPSET_PREFIX/$ngx_tapset_file' ++END ++ ++ done ++ ++ cat << END >> $NGX_MAKEFILE ++ ++ test -d '\$(DESTDIR)`dirname "$NGX_STAP_NGX_PATH"`' || \ ++ mkdir -p '\$(DESTDIR)`dirname "$NGX_STAP_NGX_PATH"`' ++ cp $NGX_OBJS/stap-nginx '\$(DESTDIR)$NGX_STAP_NGX_PATH' ++ chmod 0755 '\$(DESTDIR)$NGX_STAP_NGX_PATH' ++END ++ ++fi + + if test -n "$NGX_ERROR_LOG_PATH"; then + cat << END >> $NGX_MAKEFILE +@@ -162,6 +216,18 @@ END + fi + + ++if [ $NGX_DTRACE = YES ]; then ++ cat << END >> $NGX_MAKEFILE ++ ++$NGX_OBJS${ngx_dirsep}stap-nginx: src/dtrace/stap-nginx ++ sed -e "s|NGX_TAPSET_PREFIX|$NGX_TAPSET_PREFIX|g" $ngx_long_cont \ ++ -e "s|NGX_SBIN_DIR|`dirname $NGX_SBIN_PATH`|g" $ngx_long_cont \ ++ -e "s|NGX_SBIN_PATH|$NGX_SBIN_PATH|g" $ngx_long_cont \ ++ src/dtrace/stap-nginx > $NGX_OBJS${ngx_dirsep}stap-nginx ++END ++fi ++ ++ + # create Makefile + + cat << END >> Makefile +diff --git a/auto/make b/auto/make +index 05b7454..aa813b1 100644 +--- a/auto/make ++++ b/auto/make +@@ -26,6 +26,9 @@ LINK = $LINK + + END + ++if [ $NGX_DTRACE = YES ]; then ++ echo DTRACE = $DTRACE >> $NGX_MAKEFILE ++fi + + if test -n "$NGX_PERL_CFLAGS"; then + echo NGX_PERL_CFLAGS = $NGX_PERL_CFLAGS >> $NGX_MAKEFILE +@@ -177,6 +180,44 @@ ngx_objs=`echo $ngx_all_objs $ngx_modules_obj \ + | sed -e "s/ *\([^ ][^ ]*\)/$ngx_long_regex_cont\1/g" \ + -e "s/\//$ngx_regex_dirsep/g"` + ++if [ $NGX_DTRACE = YES ]; then ++ ++ ngx_dtrace_obj=$NGX_OBJS${ngx_dirsep}ngx_dtrace_provider.$ngx_objext ++ ++ ngx_dtrace_h=$NGX_OBJS${ngx_dirsep}ngx_dtrace_provider.h ++ ++ ngx_dtrace_d=$NGX_OBJS${ngx_dirsep}dtrace_providers.d ++ ++ ngx_dtrace_providers=`echo $NGX_DTRACE_PROVIDERS \ ++ | sed -e "s/ *\([^ ][^ ]*\)/$ngx_long_regex_cont\1/g" \ ++ -e "s/\//$ngx_regex_dirsep/g"` ++ ++ cat << END >> $NGX_MAKEFILE ++ ++all: $NGX_OBJS${ngx_dirsep}nginx${ngx_binext} ++ ++$ngx_dtrace_d: $ngx_dtrace_providers ++ cat $ngx_dtrace_providers > $ngx_dtrace_d ++ ++$ngx_dtrace_h: $ngx_dtrace_d ++ \$(DTRACE) -xnolibs -h -o $ngx_dtrace_h -s $ngx_dtrace_d ++END ++ ++ if [ $DTRACE_PROBE_OBJ = YES ]; then ++ cat << END >> $NGX_MAKEFILE ++$ngx_dtrace_obj: $ngx_dtrace_d $ngx_deps$ngx_spacer ++ \$(DTRACE) -xnolibs -G -o $ngx_dtrace_obj -s $ngx_dtrace_d $ngx_objs ++END ++ ++ ngx_deps="$ngx_deps$ngx_long_cont$ngx_dtrace_obj" ++ ngx_objs="$ngx_objs$ngx_long_cont$ngx_dtrace_obj" ++ ++ if [ "$DTRACE_FROM_SYSTEMTAP" = YES ]; then ++ ngx_deps="$ngx_deps$ngx_long_cont$NGX_OBJS${ngx_dirsep}stap-nginx" ++ fi ++ fi ++fi ++ + if test -n "$NGX_LD_OPT$CORE_LIBS"; then + ngx_libs=`echo $NGX_LD_OPT $CORE_LIBS \ + | sed -e "s/\//$ngx_regex_dirsep/g" -e "s/^/$ngx_long_regex_cont/"` +diff --git a/auto/options b/auto/options +index a1f7386..56e85e7 100644 +--- a/auto/options ++++ b/auto/options +@@ -12,6 +12,8 @@ NGX_CONF_PATH= + NGX_ERROR_LOG_PATH= + NGX_PID_PATH= + NGX_LOCK_PATH= ++NGX_TAPSET_PREFIX= ++NGX_STAP_NGX_PATH= + NGX_USER= + NGX_GROUP= + +@@ -20,6 +22,12 @@ CPP= + NGX_OBJS=objs + + NGX_DEBUG=NO ++NGX_DTRACE=NO ++DTRACE=dtrace ++ ++DTRACE_PROBE_OBJ=YES ++DTRACE_FROM_SYSTEMTAP=NO ++ + NGX_CC_OPT= + NGX_LD_OPT= + CPU=NO +@@ -173,6 +181,8 @@ do + --error-log-path=*) NGX_ERROR_LOG_PATH="$value";; + --pid-path=*) NGX_PID_PATH="$value" ;; + --lock-path=*) NGX_LOCK_PATH="$value" ;; ++ --tapset-prefix=*) NGX_TAPSET_PREFIX="$value" ;; ++ --stap-nginx-path=*) NGX_STAP_NGX_PATH="$value" ;; + --user=*) NGX_USER="$value" ;; + --group=*) NGX_GROUP="$value" ;; + +@@ -281,7 +291,8 @@ use the \"--without-http_limit_conn_module\" option instead" + --with-ld-opt=*) NGX_LD_OPT="$value" ;; + --with-cpu-opt=*) CPU="$value" ;; + --with-debug) NGX_DEBUG=YES ;; +- ++ --with-dtrace=*) DTRACE="$value" ;; ++ --with-dtrace-probes) NGX_DTRACE=YES ;; + --without-pcre) USE_PCRE=DISABLED ;; + --with-pcre) USE_PCRE=YES ;; + --with-pcre=*) PCRE="$value" ;; +@@ -336,6 +347,8 @@ cat << END + --error-log-path=PATH set error log pathname + --pid-path=PATH set nginx.pid pathname + --lock-path=PATH set nginx.lock pathname ++ --tapset-prefix=PATH set systemtap tapset directory prefix ++ --stap-nginx-path=PATH set stap-nginx pathname + + --user=USER set non-privileged user for + worker processes +@@ -466,6 +479,8 @@ cat << END + --with-openssl-opt=OPTIONS set additional build options for OpenSSL + + --with-debug enable debug logging ++ --with-dtrace-probes enable dtrace USDT probes ++ --with-dtrace=PATH set dtrace utility pathname + + END + +@@ -495,6 +510,7 @@ NGX_CONF_PATH=${NGX_CONF_PATH:-conf/nginx.conf} + NGX_CONF_PREFIX=`dirname $NGX_CONF_PATH` + NGX_PID_PATH=${NGX_PID_PATH:-logs/nginx.pid} + NGX_LOCK_PATH=${NGX_LOCK_PATH:-logs/nginx.lock} ++NGX_TAPSET_PREFIX=${NGX_TAPSET_PREFIX:-tapset} + + if [ ".$NGX_ERROR_LOG_PATH" = ".stderr" ]; then + NGX_ERROR_LOG_PATH= +diff --git a/auto/os/darwin b/auto/os/darwin +index b97518a..a3d0a8d 100644 +--- a/auto/os/darwin ++++ b/auto/os/darwin +@@ -114,3 +114,6 @@ ngx_feature_libs= + ngx_feature_test="int32_t lock, n; + n = OSAtomicCompareAndSwap32Barrier(0, 1, &lock)" + . auto/feature ++ ++DTRACE_PROBE_OBJ=NO ++ +diff --git a/auto/os/freebsd b/auto/os/freebsd +index 6aa823f..ee15166 100644 +--- a/auto/os/freebsd ++++ b/auto/os/freebsd +@@ -142,3 +142,8 @@ if [ $version -ge 701000 ]; then + echo " + cpuset_setaffinity() found" + have=NGX_HAVE_CPUSET_SETAFFINITY . auto/have + fi ++ ++if [ $NGX_DTRACE = YES ]; then ++ NGX_LD_OPT="$NGX_LD_OPT -lelf" ++fi ++ +diff --git a/auto/os/linux b/auto/os/linux +index 19bf832..905e803 100644 +--- a/auto/os/linux ++++ b/auto/os/linux +@@ -183,3 +183,5 @@ ngx_include="sys/vfs.h"; . auto/include + + + CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64" ++ ++DTRACE_FROM_SYSTEMTAP=YES +diff --git a/auto/sources b/auto/sources +index bff0eb1..1437886 100644 +--- a/auto/sources ++++ b/auto/sources +@@ -37,9 +37,15 @@ CORE_DEPS="src/core/nginx.h \ + src/core/ngx_resolver.h \ + src/core/ngx_open_file_cache.h \ + src/core/ngx_crypt.h \ ++ src/core/ngx_core_probe.h \ + src/core/ngx_proxy_protocol.h" + + ++if [ $NGX_DTRACE = YES ]; then ++ CORE_DEPS="$CORE_DEPS objs/ngx_dtrace_provider.h" ++fi ++ ++ + CORE_SRCS="src/core/nginx.c \ + src/core/ngx_log.c \ + src/core/ngx_palloc.c \ +@@ -85,14 +91,15 @@ OPENSSL_SRCS="src/event/ngx_event_openssl.c \ + + EVENT_MODULES="ngx_events_module ngx_event_core_module" + +-EVENT_INCS="src/event src/event/modules" ++EVENT_INCS="src/event src/event/modules src/http src/http/modules" + + EVENT_DEPS="src/event/ngx_event.h \ + src/event/ngx_event_timer.h \ + src/event/ngx_event_posted.h \ + src/event/ngx_event_busy_lock.h \ + src/event/ngx_event_connect.h \ +- src/event/ngx_event_pipe.h" ++ src/event/ngx_event_pipe.h \ ++ src/event/ngx_event_probe.h" + + EVENT_SRCS="src/event/ngx_event.c \ + src/event/ngx_event_timer.c \ +@@ -294,7 +301,8 @@ HTTP_DEPS="src/http/ngx_http.h \ + src/http/ngx_http_script.h \ + src/http/ngx_http_upstream.h \ + src/http/ngx_http_upstream_round_robin.h \ +- src/http/ngx_http_busy_lock.h" ++ src/http/ngx_http_busy_lock.h \ ++ src/http/ngx_http_probe.h" + + HTTP_SRCS="src/http/ngx_http.c \ + src/http/ngx_http_core_module.c \ +@@ -549,3 +557,8 @@ NGX_GOOGLE_PERFTOOLS_MODULE=ngx_google_perftools_module + NGX_GOOGLE_PERFTOOLS_SRCS=src/misc/ngx_google_perftools_module.c + + NGX_CPP_TEST_SRCS=src/misc/ngx_cpp_test_module.cpp ++ ++NGX_DTRACE_PROVIDERS=src/dtrace/nginx_provider.d ++ ++NGX_TAPSET_SRCS=src/dtrace/nginx.stp ++ +diff --git a/auto/summary b/auto/summary +index dcebec9..3cb269e 100644 +--- a/auto/summary ++++ b/auto/summary +@@ -92,6 +92,19 @@ else + echo " nginx logs errors to stderr" + fi + ++if [ $NGX_DTRACE = YES ]; then ++ cat << END ++ nginx dtrace static probes enabled ++END ++ ++ if [ $DTRACE_FROM_SYSTEMTAP = YES ]; then ++ cat << END ++ nginx systemtap tapset prefix: "$NGX_TAPSET_PREFIX" ++ nginx systemtap wrapper script: "$NGX_STAP_NGX_PATH" ++END ++ fi ++fi ++ + cat << END + nginx http access log file: "$NGX_HTTP_LOG_PATH" + nginx http client request body temporary files: "$NGX_HTTP_CLIENT_TEMP_PATH" +diff --git a/configure b/configure +index d7d8189..05fab87 100755 +--- a/configure ++++ b/configure +@@ -23,6 +23,9 @@ if [ $NGX_DEBUG = YES ]; then + have=NGX_DEBUG . auto/have + fi + ++if [ $NGX_DTRACE = YES ]; then ++ have=NGX_DTRACE . auto/have ++fi + + if test -z "$NGX_PLATFORM"; then + echo "checking for OS" +diff --git a/src/core/ngx_core_probe.h b/src/core/ngx_core_probe.h +new file mode 100644 +index 0000000..91bf91e +--- /dev/null ++++ b/src/core/ngx_core_probe.h +@@ -0,0 +1,25 @@ ++#ifndef _NGX_CORE_PROBE_H_INCLUDED_ ++#define _NGX_CORE_PROBE_H_INCLUDED_ ++ ++ ++#include ++#include ++#include ++ ++ ++#if (NGX_DTRACE) ++ ++#include ++#include ++ ++#define ngx_core_probe_create_pool_done(pool, size) \ ++ NGINX_CREATE_POOL_DONE(pool, size) ++ ++#else /* !(NGX_DTRACE) */ ++ ++#define ngx_core_probe_create_pool_done(pool, size) ++ ++#endif ++ ++ ++#endif /* _NGX_CORE_PROBE_H_INCLUDED_ */ +diff --git a/src/core/ngx_palloc.c b/src/core/ngx_palloc.c +index 1f70f9e..d8c90cd 100644 +--- a/src/core/ngx_palloc.c ++++ b/src/core/ngx_palloc.c +@@ -7,6 +7,7 @@ + + #include + #include ++#include + + + static void *ngx_palloc_block(ngx_pool_t *pool, size_t size); +@@ -37,6 +38,8 @@ ngx_create_pool(size_t size, ngx_log_t *log) + p->cleanup = NULL; + p->log = log; + ++ ngx_core_probe_create_pool_done(p, size); ++ + return p; + } + +diff --git a/src/dtrace/nginx.stp b/src/dtrace/nginx.stp +new file mode 100644 +index 0000000..e824daf +--- /dev/null ++++ b/src/dtrace/nginx.stp +@@ -0,0 +1,299 @@ ++/* tapset for nginx */ ++ ++ ++function ngx_indent(n, delta) ++{ ++ s = "" ++ for (i = 0; i < n; i++) { ++ s .= delta ++ } ++ ++ return s ++} ++ ++ ++function ngx_http_subreq_depth(r) ++{ ++ depth = 0 ++ ++ for (pr = @cast(r, "ngx_http_request_t", "NGX_SBIN_PATH")->parent; ++ pr != 0; ++ pr = @cast(pr, "ngx_http_request_t", "NGX_SBIN_PATH")->parent) ++ { ++ depth++ ++ } ++ ++ return depth ++} ++ ++ ++function ngx_http_req_parent(r) ++{ ++ return @cast(r, "ngx_http_request_s", "NGX_SBIN_PATH")->parent ++} ++ ++ ++/* retrieve the request uri string from the ngx_http_request_t pointer */ ++function ngx_http_req_uri(r) ++{ ++ len = @cast(r, "ngx_http_request_s", "NGX_SBIN_PATH")->uri->len ++ ++ if (len == 0) { ++ return "" ++ } ++ ++ return user_string_n(@cast(r, "ngx_http_request_s", "NGX_SBIN_PATH")->uri->data, len) ++} ++ ++ ++/* retrieve the request query string from the ngx_http_request_t pointer */ ++function ngx_http_req_args(r) ++{ ++ len = @cast(r, "ngx_http_request_s", "NGX_SBIN_PATH")->args->len ++ ++ if (len == 0) { ++ return "" ++ } ++ ++ return user_string_n(@cast(r, "ngx_http_request_s", "NGX_SBIN_PATH")->args->data, len) ++} ++ ++ ++/* retrieve the first command name (or directive name) from ++ * the ngx_module_t pointer */ ++function ngx_http_module_cmd(m) ++{ ++ cmds = @cast(m, "ngx_module_t", "NGX_SBIN_PATH")->commands ++ if (cmds == 0) { ++ return "" ++ } ++ ++ len = @cast(cmds, "ngx_command_t", "NGX_SBIN_PATH")->name->len ++ ++ if (len == 0) { ++ return "" ++ } ++ ++ return user_string_n(@cast(cmds, "ngx_command_t", "NGX_SBIN_PATH")->name->data, len) ++} ++ ++ ++function ngx_chain_buf(cl) ++{ ++ return @cast(cl, "ngx_chain_t", "NGX_SBIN_PATH")->buf ++} ++ ++ ++function ngx_chain_next(cl) ++{ ++ return @cast(cl, "ngx_chain_t", "NGX_SBIN_PATH")->next ++} ++ ++function ngx_buf_tag(b) ++{ ++ return @cast(b, "ngx_buf_t", "NGX_SBIN_PATH")->tag ++} ++ ++function ngx_buf_in_memory(b) ++{ ++ return @cast(b, "ngx_buf_t", "NGX_SBIN_PATH")->temporary ++ || @cast(b, "ngx_buf_t", "NGX_SBIN_PATH")->memory ++ || @cast(b, "ngx_buf_t", "NGX_SBIN_PATH")->mmap ++} ++ ++ ++function ngx_buf_pos(b) ++{ ++ return @cast(b, "ngx_buf_t", "NGX_SBIN_PATH")->pos ++} ++ ++ ++function ngx_buf_file_pos(b) ++{ ++ return @cast(b, "ngx_buf_t", "NGX_SBIN_PATH")->file_pos ++} ++ ++ ++function ngx_buf_last(b) ++{ ++ return @cast(b, "ngx_buf_t", "NGX_SBIN_PATH")->last ++} ++ ++ ++function ngx_buf_file_last(b) ++{ ++ return @cast(b, "ngx_buf_t", "NGX_SBIN_PATH")->file_last ++} ++ ++ ++function ngx_buf_end(b) ++{ ++ return @cast(b, "ngx_buf_t", "NGX_SBIN_PATH")->end ++} ++ ++ ++function ngx_buf_in_file(b) ++{ ++ return @cast(b, "ngx_buf_t", "NGX_SBIN_PATH")->in_file ++} ++ ++ ++function ngx_buf_last_buf(b) ++{ ++ return @cast(b, "ngx_buf_t", "/home/agentzh/git/lua-nginx-module/work/nginx/sbin/nginx")->last_buf ++} ++ ++ ++function ngx_buf_last_in_chain(b) ++{ ++ return @cast(b, "ngx_buf_t", "/home/agentzh/git/lua-nginx-module/work/nginx/sbin/nginx")->last_in_chain ++} ++ ++ ++function ngx_buf_sync(b) ++{ ++ return @cast(b, "ngx_buf_t", "/home/agentzh/git/lua-nginx-module/work/nginx/sbin/nginx")->sync ++} ++ ++ ++function ngx_buf_flush(b) ++{ ++ return @cast(b, "ngx_buf_t", "/home/agentzh/git/lua-nginx-module/work/nginx/sbin/nginx")->flush ++} ++ ++ ++function ngx_buf_size(b) ++{ ++ if (ngx_buf_in_memory(b)) { ++ return ngx_buf_last(b) - ngx_buf_pos(b) ++ } ++ ++ return ngx_buf_file_last(b) - ngx_buf_file_pos(b) ++} ++ ++ ++function ngx_buf_data(b) ++{ ++ return user_string_n(ngx_buf_pos(b), ngx_buf_last(b) - ngx_buf_pos(b)) ++} ++ ++ ++function ngx_chain_writer_ctx_out(ctx) ++{ ++ return @cast(c, "ngx_chain_writer_ctx_t", "NGX_SBIN_PATH")->out ++} ++ ++ ++function ngx_chain_dump:string (input) ++{ ++ if (input == 0) { ++ return "NULL" ++ } ++ ++ out = "" ++ cl = input ++ while (cl) { ++ buf = ngx_chain_buf(cl) ++ ++ if (ngx_buf_in_memory(buf)) { ++ out .= sprintf("[%s]", text_str(ngx_buf_data(buf))) ++ ++ } else { ++ out .= "\"\"" ++ } ++ ++ if (ngx_buf_in_file(buf)) { ++ out .= sprintf("", ngx_buf_file_pos(buf), ++ ngx_buf_file_last(buf)) ++ } ++ ++ if (ngx_buf_last_buf(buf)) { ++ out .= "" ++ } ++ ++ if (ngx_buf_last_in_chain(buf)) { ++ out .= "" ++ } ++ ++ if (ngx_buf_sync(buf)) { ++ out .= "" ++ } ++ ++ if (ngx_buf_flush(buf)) { ++ out .= "" ++ } ++ ++ tag = ngx_buf_tag(buf) ++ if (tag) { ++ out .= sprintf("", tag) ++ } ++ ++ cl = ngx_chain_next(cl) ++ if (cl) { ++ out .= " " ++ } ++ } ++ return out ++} ++ ++ ++function ngx_pool_cleanup_file_name(c) ++{ ++ return user_string(@cast(c, "ngx_pool_cleanup_file_t", "NGX_SBIN_PATH")->name) ++} ++ ++ ++function ngx_http_req_content_length(r) ++{ ++ return @cast(r, "ngx_http_request_t", "NGX_SBIN_PATH")->headers_in->content_length_n ++} ++ ++ ++function ngx_http_req_body_temp_file_name(r) ++{ ++ rb = @cast(r, "ngx_http_request_t", "NGX_SBIN_PATH")->request_body ++ if (!rb) { ++ return "" ++ } ++ ++ tf = @cast(rb, "ngx_http_request_body_t", "NGX_SBIN_PATH")->temp_file ++ if (!tf) { ++ return "" ++ } ++ ++ len = @cast(tf, "ngx_temp_file_t", "NGX_SBIN_PATH")->file->name->len ++ ++ return user_string_n(@cast(tf, "ngx_temp_file_t", "NGX_SBIN_PATH")->file->name->data, len) ++} ++ ++ ++function ngx_table_elt_key(e) ++{ ++ len = @cast(e, "ngx_table_elt_t", "NGX_SBIN_PATH")->key->len ++ ++ return user_string_n(@cast(e, "ngx_table_elt_t", "NGX_SBIN_PATH")->key->data, len) ++} ++ ++ ++function ngx_table_elt_value(e) ++{ ++ len = @cast(e, "ngx_table_elt_t", "NGX_SBIN_PATH")->value->len ++ ++ return user_string_n(@cast(e, "ngx_table_elt_t", "NGX_SBIN_PATH")->value->data, len) ++} ++ ++ ++function ngx_iovec_dump:string (iov, iovcnt) { ++ out = "" ++ for (i = 0; i < iovcnt; i++) { ++ out .= sprintf("\"%s\"(%p)", text_str(user_string_n( ++ @cast(iov, "struct iovec")[i]->iov_base, ++ @cast(iov, "struct iovec")[i]->iov_len) ++ ), @cast(iov, "struct iovec")[i]->iov_base) ++ if (i != iovcnt - 1) { ++ out .= " " ++ } ++ } ++ return out ++} ++ +diff --git a/src/dtrace/nginx_provider.d b/src/dtrace/nginx_provider.d +new file mode 100644 +index 0000000..5887ae7 +--- /dev/null ++++ b/src/dtrace/nginx_provider.d +@@ -0,0 +1,40 @@ ++typedef struct { int dummy; } ngx_http_request_t; ++typedef struct { int dummy; } ngx_str_t; ++typedef int64_t ngx_int_t; ++typedef uint64_t ngx_uint_t; ++typedef ngx_uint_t ngx_msec_t; ++typedef struct { int dummy; } ngx_module_t; ++typedef struct { int dummy; } ngx_http_module_t; ++typedef struct { int dummy; } ngx_table_elt_t; ++typedef struct { int dummy; } ngx_event_t; ++typedef struct { int dummy; } ngx_pool_t; ++typedef char unsigned u_char; ++ ++ ++provider nginx { ++ /* probes for subrequests */ ++ probe http__subrequest__cycle(ngx_http_request_t *pr, ngx_str_t *uri, ngx_str_t *args); ++ probe http__subrequest__start(ngx_http_request_t *r); ++ probe http__subrequest__finalize_writing(ngx_http_request_t *r); ++ probe http__subrequest__finalize_nonactive(ngx_http_request_t *r); ++ probe http__subrequest__wake__parent(ngx_http_request_t *r); ++ probe http__subrequest__done(ngx_http_request_t *r); ++ probe http__subrequest__post__start(ngx_http_request_t *r, ngx_int_t rc); ++ probe http__subrequest__post__done(ngx_http_request_t *r, ngx_int_t rc); ++ probe http__module__post__config(ngx_module_t *m); ++ probe http__read__body__done(ngx_http_request_t *r); ++ probe http__read__req__line__done(ngx_http_request_t *r); ++ probe http__read__req__header__done(ngx_http_request_t *r, ngx_table_elt_t *h); ++ probe timer__add(ngx_event_t *ev, ngx_msec_t timer); ++ probe timer__del(ngx_event_t *ev); ++ probe timer__expire(ngx_event_t *ev); ++ probe create__pool__done(ngx_pool_t *pool, size_t size); ++}; ++ ++ ++#pragma D attributes Evolving/Evolving/Common provider nginx provider ++#pragma D attributes Private/Private/Unknown provider nginx module ++#pragma D attributes Private/Private/Unknown provider nginx function ++#pragma D attributes Private/Private/Common provider nginx name ++#pragma D attributes Evolving/Evolving/Common provider nginx args ++ +diff --git a/src/dtrace/stap-nginx b/src/dtrace/stap-nginx +new file mode 100755 +index 0000000..1bca4cf +--- /dev/null ++++ b/src/dtrace/stap-nginx +@@ -0,0 +1,6 @@ ++#!/bin/sh ++ ++PATH="NGX_SBIN_DIR:$PATH" ++export PATH ++exec stap -d "NGX_SBIN_PATH" -I "NGX_TAPSET_PREFIX" "$@" ++ +diff --git a/src/event/ngx_event_probe.h b/src/event/ngx_event_probe.h +new file mode 100644 +index 0000000..5aa0397 +--- /dev/null ++++ b/src/event/ngx_event_probe.h +@@ -0,0 +1,33 @@ ++#ifndef _NGX_EVENT_PROBE_H_INCLUDED_ ++#define _NGX_EVENT_PROBE_H_INCLUDED_ ++ ++ ++#include ++#include ++#include ++ ++ ++#if (NGX_DTRACE) ++ ++#include ++#include ++ ++#define ngx_event_probe_timer_add(ev, timer) \ ++ NGINX_TIMER_ADD(ev, timer) ++ ++#define ngx_event_probe_timer_del(ev) \ ++ NGINX_TIMER_DEL(ev) ++ ++#define ngx_event_probe_timer_expire(ev) \ ++ NGINX_TIMER_EXPIRE(ev) ++ ++#else /* !(NGX_DTRACE) */ ++ ++#define ngx_event_probe_timer_add(ev, timer) ++#define ngx_event_probe_timer_del(ev) ++#define ngx_event_probe_timer_expire(ev) ++ ++#endif ++ ++ ++#endif /* _NGX_EVENT_PROBE_H_INCLUDED_ */ +diff --git a/src/event/ngx_event_timer.c b/src/event/ngx_event_timer.c +index 177ac1c..531cccc 100644 +--- a/src/event/ngx_event_timer.c ++++ b/src/event/ngx_event_timer.c +@@ -144,6 +144,8 @@ ngx_event_expire_timers(void) + } + #endif + ++ ngx_event_probe_timer_expire(ev); ++ + ev->timedout = 1; + + ev->handler(ev); +diff --git a/src/event/ngx_event_timer.h b/src/event/ngx_event_timer.h +index ec9b316..6095d8c 100644 +--- a/src/event/ngx_event_timer.h ++++ b/src/event/ngx_event_timer.h +@@ -12,6 +12,7 @@ + #include + #include + #include ++#include + + + #define NGX_TIMER_INFINITE (ngx_msec_t) -1 +@@ -35,6 +36,8 @@ extern ngx_thread_volatile ngx_rbtree_t ngx_event_timer_rbtree; + static ngx_inline void + ngx_event_del_timer(ngx_event_t *ev) + { ++ ngx_event_probe_timer_del(ev); ++ + ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ev->log, 0, + "event timer del: %d: %M", + ngx_event_ident(ev->data), ev->timer.key); +@@ -85,6 +88,8 @@ ngx_event_add_timer(ngx_event_t *ev, ngx_msec_t timer) + + ev->timer.key = key; + ++ ngx_event_probe_timer_add(ev, timer); ++ + ngx_log_debug3(NGX_LOG_DEBUG_EVENT, ev->log, 0, + "event timer add: %d: %M:%M", + ngx_event_ident(ev->data), timer, ev->timer.key); +diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c +index ce5adb7..13c6a52 100644 +--- a/src/http/ngx_http.c ++++ b/src/http/ngx_http.c +@@ -8,6 +8,7 @@ + #include + #include + #include ++#include + + + static char *ngx_http_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); +@@ -307,6 +308,9 @@ ngx_http_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) + module = ngx_modules[m]->ctx; + + if (module->postconfiguration) { ++ ++ ngx_http_probe_module_post_config(ngx_modules[m]); ++ + if (module->postconfiguration(cf) != NGX_OK) { + return NGX_CONF_ERROR; + } +diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c +index d13a9ae..58acb82 100644 +--- a/src/http/ngx_http_core_module.c ++++ b/src/http/ngx_http_core_module.c +@@ -8,6 +8,7 @@ + #include + #include + #include ++#include + + + typedef struct { +@@ -2448,6 +2449,8 @@ ngx_http_subrequest(ngx_http_request_t *r, + r->main->subrequests--; + + if (r->main->subrequests == 0) { ++ ngx_http_probe_subrequest_cycle(r, uri, args); ++ + ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, + "subrequests cycle while processing \"%V\"", uri); + r->main->subrequests = 1; +@@ -2564,6 +2567,8 @@ ngx_http_subrequest(ngx_http_request_t *r, + + *psr = sr; + ++ ngx_http_probe_subrequest_start(sr); ++ + return ngx_http_post_request(sr, NULL); + } + +diff --git a/src/http/ngx_http_probe.h b/src/http/ngx_http_probe.h +new file mode 100644 +index 0000000..d7d2d45 +--- /dev/null ++++ b/src/http/ngx_http_probe.h +@@ -0,0 +1,75 @@ ++#ifndef _NGX_HTTP_PROBE_H_INCLUDED_ ++#define _NGX_HTTP_PROBE_H_INCLUDED_ ++ ++ ++#include ++#include ++#include ++ ++ ++#if (NGX_DTRACE) ++ ++#include ++ ++#define ngx_http_probe_subrequest_cycle(pr, uri, args) \ ++ NGINX_HTTP_SUBREQUEST_CYCLE(pr, uri, args) ++ ++#define ngx_http_probe_subrequest_start(r) \ ++ NGINX_HTTP_SUBREQUEST_START(r) ++ ++#define ngx_http_probe_subrequest_finalize_writing(r) \ ++ NGINX_HTTP_SUBREQUEST_FINALIZE_WRITING(r) ++ ++#define ngx_http_probe_subrequest_finalize_nonactive(r) \ ++ NGINX_HTTP_SUBREQUEST_FINALIZE_NONACTIVE(r) ++ ++#define ngx_http_probe_subrequest_finalize_nonactive(r) \ ++ NGINX_HTTP_SUBREQUEST_FINALIZE_NONACTIVE(r) ++ ++#define ngx_http_probe_subrequest_wake_parent(r) \ ++ NGINX_HTTP_SUBREQUEST_WAKE_PARENT(r) ++ ++#define ngx_http_probe_subrequest_done(r) \ ++ NGINX_HTTP_SUBREQUEST_DONE(r) ++ ++#define ngx_http_probe_subrequest_post_start(r, rc) \ ++ NGINX_HTTP_SUBREQUEST_POST_START(r, rc) ++ ++#define ngx_http_probe_subrequest_post_done(r, rc) \ ++ NGINX_HTTP_SUBREQUEST_POST_DONE(r, rc) ++ ++#define ngx_http_probe_module_post_config(m) \ ++ NGINX_HTTP_MODULE_POST_CONFIG(m) ++ ++#define ngx_http_probe_read_body_abort(r, reason) \ ++ NGINX_HTTP_READ_BODY_ABORT(r, reason) ++ ++#define ngx_http_probe_read_body_done(r) \ ++ NGINX_HTTP_READ_BODY_DONE(r) ++ ++#define ngx_http_probe_read_req_line_done(r) \ ++ NGINX_HTTP_READ_REQ_LINE_DONE(r) ++ ++#define ngx_http_probe_read_req_header_done(r, h) \ ++ NGINX_HTTP_READ_REQ_HEADER_DONE(r, h) ++ ++#else /* !(NGX_DTRACE) */ ++ ++#define ngx_http_probe_subrequest_cycle(pr, uri, args) ++#define ngx_http_probe_subrequest_start(r) ++#define ngx_http_probe_subrequest_finalize_writing(r) ++#define ngx_http_probe_subrequest_finalize_nonactive(r) ++#define ngx_http_probe_subrequest_wake_parent(r) ++#define ngx_http_probe_subrequest_done(r) ++#define ngx_http_probe_subrequest_post_start(r, rc) ++#define ngx_http_probe_subrequest_post_done(r, rc) ++#define ngx_http_probe_module_post_config(m) ++#define ngx_http_probe_read_body_abort(r, reason) ++#define ngx_http_probe_read_body_done(r) ++#define ngx_http_probe_read_req_line_done(r) ++#define ngx_http_probe_read_req_header_done(r, h) ++ ++#endif /* NGX_DTRACE */ ++ ++ ++#endif /* _NGX_HTTP_PROBE_H_INCLUDED_ */ +diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c +index 315057f..6ed81e0 100644 +--- a/src/http/ngx_http_request.c ++++ b/src/http/ngx_http_request.c +@@ -8,6 +8,7 @@ + #include + #include + #include ++#include + + + static void ngx_http_wait_request_handler(ngx_event_t *ev); +@@ -1048,7 +1049,6 @@ ngx_http_process_request_line(ngx_event_t *rev) + } + } + +- + ngx_int_t + ngx_http_process_request_uri(ngx_http_request_t *r) + { +@@ -1304,6 +1304,8 @@ ngx_http_process_request_headers(ngx_event_t *rev) + return; + } + ++ ngx_http_probe_read_req_header_done(r, h); ++ + ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, + "http header: \"%V: %V\"", + &h->key, &h->value); +@@ -2278,7 +2280,11 @@ ngx_http_finalize_request(ngx_http_request_t *r, ngx_int_t rc) + } + + if (r != r->main && r->post_subrequest) { ++ ngx_http_probe_subrequest_post_start(r, rc); ++ + rc = r->post_subrequest->handler(r, r->post_subrequest->data, rc); ++ ++ ngx_http_probe_subrequest_post_done(r, rc); + } + + if (rc == NGX_ERROR +@@ -2328,6 +2334,8 @@ ngx_http_finalize_request(ngx_http_request_t *r, ngx_int_t rc) + + if (r->buffered || r->postponed) { + ++ ngx_http_probe_subrequest_finalize_writing(r); ++ + if (ngx_http_set_write_handler(r) != NGX_OK) { + ngx_http_terminate_request(r, 0); + } +@@ -2364,10 +2372,14 @@ ngx_http_finalize_request(ngx_http_request_t *r, ngx_int_t rc) + pr->postponed = pr->postponed->next; + } + ++ ngx_http_probe_subrequest_done(r); ++ + c->data = pr; + + } else { + ++ ngx_http_probe_subrequest_finalize_nonactive(r); ++ + ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0, + "http finalize non-active request: \"%V?%V\"", + &r->uri, &r->args); +@@ -2379,6 +2391,8 @@ ngx_http_finalize_request(ngx_http_request_t *r, ngx_int_t rc) + } + } + ++ ngx_http_probe_subrequest_wake_parent(r); ++ + if (ngx_http_post_request(pr, NULL) != NGX_OK) { + r->main->count++; + ngx_http_terminate_request(r, 0); +diff --git a/src/http/ngx_http_request_body.c b/src/http/ngx_http_request_body.c +index bbf16fd..0ed08ee 100644 +--- a/src/http/ngx_http_request_body.c ++++ b/src/http/ngx_http_request_body.c +@@ -8,6 +8,7 @@ + #include + #include + #include ++#include + + + static void ngx_http_read_client_request_body_handler(ngx_http_request_t *r); +@@ -405,6 +406,8 @@ ngx_http_do_read_client_request_body(ngx_http_request_t *r) + + r->read_event_handler = ngx_http_block_reading; + ++ ngx_http_probe_read_body_done(r); ++ + rb->post_handler(r); + + return NGX_OK; diff --git a/patches/nginx-1.7.0-gcc-maybe-uninitialized-warning.patch b/patches/nginx-1.7.0-gcc-maybe-uninitialized-warning.patch new file mode 100644 index 0000000..34dea06 --- /dev/null +++ b/patches/nginx-1.7.0-gcc-maybe-uninitialized-warning.patch @@ -0,0 +1,11 @@ +--- nginx-1.7.0/src/http/ngx_http_request.c 2013-05-06 03:26:50.000000000 -0700 ++++ nginx-1.7.0-patched/src/http/ngx_http_request.c 2013-06-11 12:59:48.008321688 -0700 +@@ -1951,7 +1951,7 @@ + ngx_int_t rc; + ngx_http_connection_t *hc; + ngx_http_core_loc_conf_t *clcf; +- ngx_http_core_srv_conf_t *cscf; ++ ngx_http_core_srv_conf_t *cscf = NULL; + + hc = r->http_connection; + diff --git a/patches/nginx-1.7.0-larger_max_error_str.patch b/patches/nginx-1.7.0-larger_max_error_str.patch new file mode 100644 index 0000000..1854eb9 --- /dev/null +++ b/patches/nginx-1.7.0-larger_max_error_str.patch @@ -0,0 +1,13 @@ +--- nginx-1.7.0/src/core/ngx_log.h 2013-10-08 05:07:14.000000000 -0700 ++++ nginx-1.7.0-patched/src/core/ngx_log.h 2013-12-05 20:35:35.996236720 -0800 +@@ -64,7 +64,9 @@ struct ngx_log_s { + }; + + +-#define NGX_MAX_ERROR_STR 2048 ++#ifndef NGX_MAX_ERROR_STR ++#define NGX_MAX_ERROR_STR 4096 ++#endif + + + /*********************************/ diff --git a/patches/nginx-1.7.0-location_if_inherits_proxy.patch b/patches/nginx-1.7.0-location_if_inherits_proxy.patch new file mode 100644 index 0000000..ed4652d --- /dev/null +++ b/patches/nginx-1.7.0-location_if_inherits_proxy.patch @@ -0,0 +1,15 @@ +--- nginx-1.7.0/src/http/modules/ngx_http_proxy_module.c 2012-04-23 18:40:01.000000000 +0800 ++++ nginx-1.7.0-patched/src/http/modules/ngx_http_proxy_module.c 2012-06-24 12:48:57.289834450 +0800 +@@ -3023,8 +3023,10 @@ + + if (conf->upstream.upstream || conf->proxy_lengths) { + clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module); +- if (clcf->handler == NULL && clcf->lmt_excpt) { +- clcf->handler = ngx_http_proxy_handler; ++ if (clcf->handler == NULL) { ++ if (clcf->lmt_excpt) { ++ clcf->handler = ngx_http_proxy_handler; ++ } + conf->location = prev->location; + } + } diff --git a/patches/nginx-1.7.0-log_escape_non_ascii.patch b/patches/nginx-1.7.0-log_escape_non_ascii.patch new file mode 100644 index 0000000..c67fc7f --- /dev/null +++ b/patches/nginx-1.7.0-log_escape_non_ascii.patch @@ -0,0 +1,115 @@ +--- nginx-1.7.0/src/http/modules/ngx_http_log_module.c 2011-11-01 21:24:50.000000000 +0800 ++++ nginx-1.7.0-patched/src/http/modules/ngx_http_log_module.c 2011-11-10 16:17:29.599039534 +0800 +@@ -61,6 +61,8 @@ + time_t open_file_cache_valid; + ngx_uint_t open_file_cache_min_uses; + ++ ngx_flag_t escape_non_ascii; ++ + ngx_uint_t off; /* unsigned off:1 */ + } ngx_http_log_loc_conf_t; + +@@ -104,7 +106,8 @@ + uintptr_t data); + static u_char *ngx_http_log_variable(ngx_http_request_t *r, u_char *buf, + ngx_http_log_op_t *op); +-static uintptr_t ngx_http_log_escape(u_char *dst, u_char *src, size_t size); ++static uintptr_t ngx_http_log_escape(ngx_http_log_loc_conf_t *lcf, u_char *dst, ++ u_char *src, size_t size); + + + static void *ngx_http_log_create_main_conf(ngx_conf_t *cf); +@@ -146,6 +149,13 @@ + 0, + NULL }, + ++ { ngx_string("log_escape_non_ascii"), ++ NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, ++ ngx_conf_set_flag_slot, ++ NGX_HTTP_LOC_CONF_OFFSET, ++ offsetof(ngx_http_log_loc_conf_t, escape_non_ascii), ++ NULL }, ++ + ngx_null_command + }; + +@@ -637,6 +647,7 @@ + ngx_http_log_variable_getlen(ngx_http_request_t *r, uintptr_t data) + { + uintptr_t len; ++ ngx_http_log_loc_conf_t *lcf; + ngx_http_variable_value_t *value; + + value = ngx_http_get_indexed_variable(r, data); +@@ -645,7 +656,9 @@ + return 1; + } + +- len = ngx_http_log_escape(NULL, value->data, value->len); ++ lcf = ngx_http_get_module_loc_conf(r, ngx_http_log_module); ++ ++ len = ngx_http_log_escape(lcf, NULL, value->data, value->len); + + value->escape = len ? 1 : 0; + +@@ -656,6 +669,7 @@ + static u_char * + ngx_http_log_variable(ngx_http_request_t *r, u_char *buf, ngx_http_log_op_t *op) + { ++ ngx_http_log_loc_conf_t *lcf; + ngx_http_variable_value_t *value; + + value = ngx_http_get_indexed_variable(r, op->data); +@@ -669,16 +683,18 @@ + return ngx_cpymem(buf, value->data, value->len); + + } else { +- return (u_char *) ngx_http_log_escape(buf, value->data, value->len); ++ lcf = ngx_http_get_module_loc_conf(r, ngx_http_log_module); ++ return (u_char *) ngx_http_log_escape(lcf, buf, value->data, value->len); + } + } + + + static uintptr_t +-ngx_http_log_escape(u_char *dst, u_char *src, size_t size) ++ngx_http_log_escape(ngx_http_log_loc_conf_t *lcf, u_char *dst, u_char *src, ++ size_t size) + { +- ngx_uint_t n; +- static u_char hex[] = "0123456789ABCDEF"; ++ ngx_uint_t n; ++ static u_char hex[] = "0123456789ABCDEF"; + + static uint32_t escape[] = { + 0xffffffff, /* 1111 1111 1111 1111 1111 1111 1111 1111 */ +@@ -698,6 +714,12 @@ + 0xffffffff, /* 1111 1111 1111 1111 1111 1111 1111 1111 */ + }; + ++ if (lcf->escape_non_ascii) { ++ ngx_memset(&escape[4], 0xff, sizeof(uint32_t) * 4); ++ ++ } else { ++ ngx_memzero(&escape[4], sizeof(uint32_t) * 4); ++ } + + if (dst == NULL) { + +@@ -781,6 +803,7 @@ + } + + conf->open_file_cache = NGX_CONF_UNSET_PTR; ++ conf->escape_non_ascii = NGX_CONF_UNSET; + + return conf; + } +@@ -796,6 +819,8 @@ + ngx_http_log_fmt_t *fmt; + ngx_http_log_main_conf_t *lmcf; + ++ ngx_conf_merge_value(conf->escape_non_ascii, prev->escape_non_ascii, 1); ++ + if (conf->open_file_cache == NGX_CONF_UNSET_PTR) { + + conf->open_file_cache = prev->open_file_cache; diff --git a/patches/nginx-1.7.0-no_Werror.patch b/patches/nginx-1.7.0-no_Werror.patch new file mode 100644 index 0000000..ae5dd3e --- /dev/null +++ b/patches/nginx-1.7.0-no_Werror.patch @@ -0,0 +1,36 @@ +diff -urp nginx-1.7.0/auto/cc/clang nginx-1.7.0-patched/auto/cc/clang +--- nginx-1.7.0/auto/cc/clang 2014-03-04 03:39:24.000000000 -0800 ++++ nginx-1.7.0-patched/auto/cc/clang 2014-03-13 20:54:26.241413360 -0700 +@@ -89,7 +89,7 @@ CFLAGS="$CFLAGS -Wconditional-uninitiali + CFLAGS="$CFLAGS -Wno-unused-parameter" + + # stop on warning +-CFLAGS="$CFLAGS -Werror" ++#CFLAGS="$CFLAGS -Werror" + + # debug + CFLAGS="$CFLAGS -g" +diff -urp nginx-1.7.0/auto/cc/gcc nginx-1.7.0-patched/auto/cc/gcc +--- nginx-1.7.0/auto/cc/gcc 2014-03-04 03:39:24.000000000 -0800 ++++ nginx-1.7.0-patched/auto/cc/gcc 2014-03-13 20:54:13.301355329 -0700 +@@ -168,7 +168,7 @@ esac + + + # stop on warning +-CFLAGS="$CFLAGS -Werror" ++#CFLAGS="$CFLAGS -Werror" + + # debug + CFLAGS="$CFLAGS -g" +diff -urp nginx-1.7.0/auto/cc/icc nginx-1.7.0-patched/auto/cc/icc +--- nginx-1.7.0/auto/cc/icc 2014-03-04 03:39:24.000000000 -0800 ++++ nginx-1.7.0-patched/auto/cc/icc 2014-03-13 20:54:13.301355329 -0700 +@@ -115,7 +115,7 @@ case "$NGX_ICC_VER" in + esac + + # stop on warning +-CFLAGS="$CFLAGS -Werror" ++#CFLAGS="$CFLAGS -Werror" + + # debug + CFLAGS="$CFLAGS -g" diff --git a/patches/nginx-1.7.0-no_error_pages.patch b/patches/nginx-1.7.0-no_error_pages.patch new file mode 100644 index 0000000..7bdbba6 --- /dev/null +++ b/patches/nginx-1.7.0-no_error_pages.patch @@ -0,0 +1,90 @@ +--- nginx-1.7.0/src/http/ngx_http_core_module.c 2010-12-14 18:38:42.000000000 +0800 ++++ nginx-1.7.0-patched/src/http/ngx_http_core_module.c 2011-01-30 19:24:34.956354518 +0800 +@@ -57,6 +57,8 @@ + void *conf); + static char *ngx_http_core_error_page(ngx_conf_t *cf, ngx_command_t *cmd, + void *conf); ++static char *ngx_http_core_no_error_pages(ngx_conf_t *cf, ngx_command_t *cmd, ++ void *conf); + static char *ngx_http_core_try_files(ngx_conf_t *cf, ngx_command_t *cmd, + void *conf); + static char *ngx_http_core_open_file_cache(ngx_conf_t *cf, ngx_command_t *cmd, +@@ -614,6 +616,14 @@ + 0, + NULL }, + ++ { ngx_string("no_error_pages"), ++ NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF ++ |NGX_CONF_NOARGS, ++ ngx_http_core_no_error_pages, ++ NGX_HTTP_LOC_CONF_OFFSET, ++ 0, ++ NULL }, ++ + { ngx_string("try_files"), + NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_2MORE, + ngx_http_core_try_files, +@@ -3052,7 +3062,6 @@ + * clcf->types = NULL; + * clcf->default_type = { 0, NULL }; + * clcf->error_log = NULL; +- * clcf->error_pages = NULL; + * clcf->try_files = NULL; + * clcf->client_body_path = NULL; + * clcf->regex = NULL; +@@ -3062,6 +3071,7 @@ + * clcf->gzip_proxied = 0; + */ + ++ clcf->error_pages = NGX_CONF_UNSET_PTR; + clcf->client_max_body_size = NGX_CONF_UNSET; + clcf->client_body_buffer_size = NGX_CONF_UNSET_SIZE; + clcf->client_body_timeout = NGX_CONF_UNSET_MSEC; +@@ -3250,9 +3260,7 @@ + } + } + +- if (conf->error_pages == NULL && prev->error_pages) { +- conf->error_pages = prev->error_pages; +- } ++ ngx_conf_merge_ptr_value(conf->error_pages, prev->error_pages, NULL); + + ngx_conf_merge_str_value(conf->default_type, + prev->default_type, "text/plain"); +@@ -3988,6 +3996,10 @@ + ngx_http_compile_complex_value_t ccv; + + if (clcf->error_pages == NULL) { ++ return "conflicts with \"no_error_pages\""; ++ } ++ ++ if (clcf->error_pages == NGX_CONF_UNSET_PTR) { + clcf->error_pages = ngx_array_create(cf->pool, 4, + sizeof(ngx_http_err_page_t)); + if (clcf->error_pages == NULL) { +@@ -4095,6 +4107,25 @@ + + + static char * ++ngx_http_core_no_error_pages(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) ++{ ++ ngx_http_core_loc_conf_t *clcf = conf; ++ ++ if (clcf->error_pages == NULL) { ++ return "is duplicate"; ++ } ++ ++ if (clcf->error_pages != NGX_CONF_UNSET_PTR) { ++ return "conflicts with \"error_page\""; ++ } ++ ++ clcf->error_pages = NULL; ++ ++ return NGX_CONF_OK; ++} ++ ++ ++static char * + ngx_http_core_try_files(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) + { + ngx_http_core_loc_conf_t *clcf = conf; diff --git a/patches/nginx-1.7.0-no_pool.patch b/patches/nginx-1.7.0-no_pool.patch new file mode 100644 index 0000000..1cb95e7 --- /dev/null +++ b/patches/nginx-1.7.0-no_pool.patch @@ -0,0 +1,606 @@ +diff -upr nginx-1.7.0/src/core/nginx.h nginx-1.7.0-patched/src/core/nginx.h +--- nginx-1.7.0/src/core/nginx.h 2013-05-06 03:26:50.000000000 -0700 ++++ nginx-1.7.0-patched/src/core/nginx.h 2013-06-10 16:12:23.691136795 -0700 +@@ -10,7 +10,7 @@ + + + #define nginx_version 1007000 + #define NGINX_VERSION "1.7.0" +-#define NGINX_VER "openresty/" NGINX_VERSION ".unknown" ++#define NGINX_VER "openresty/" NGINX_VERSION ".unknown (no pool)" + + #define NGINX_VAR "NGINX" +diff -urp nginx-1.7.0/src/core/ngx_array.c nginx-1.7.0-patched/src/core/ngx_array.c +--- nginx-1.7.0/src/core/ngx_array.c 2014-01-22 05:43:00.000000000 -0800 ++++ nginx-1.7.0-patched/src/core/ngx_array.c 2014-01-27 21:25:14.887049509 -0800 +@@ -30,26 +30,30 @@ ngx_array_create(ngx_pool_t *p, ngx_uint + void + ngx_array_destroy(ngx_array_t *a) + { +- ngx_pool_t *p; ++ ngx_pool_t *p; ++ ngx_array_link_t *link; + + p = a->pool; + +- if ((u_char *) a->elts + a->size * a->nalloc == p->d.last) { +- p->d.last -= a->size * a->nalloc; ++ if (a->elts) { ++ ngx_pfree(p, a->elts); + } + +- if ((u_char *) a + sizeof(ngx_array_t) == p->d.last) { +- p->d.last = (u_char *) a; ++ for (link = a->old_elts; link; link = link->next) { ++ ngx_pfree(p, link->elts); + } ++ ++ ngx_pfree(p, a); + } + + + void * + ngx_array_push(ngx_array_t *a) + { +- void *elt, *new; +- size_t size; +- ngx_pool_t *p; ++ void *elt, *new; ++ size_t size; ++ ngx_pool_t *p; ++ ngx_array_link_t *link; + + if (a->nelts == a->nalloc) { + +@@ -59,29 +63,27 @@ ngx_array_push(ngx_array_t *a) + + p = a->pool; + +- if ((u_char *) a->elts + size == p->d.last +- && p->d.last + a->size <= p->d.end) +- { +- /* +- * the array allocation is the last in the pool +- * and there is space for new allocation +- */ +- +- p->d.last += a->size; +- a->nalloc++; +- +- } else { +- /* allocate a new array */ +- +- new = ngx_palloc(p, 2 * size); +- if (new == NULL) { +- return NULL; +- } +- +- ngx_memcpy(new, a->elts, size); +- a->elts = new; +- a->nalloc *= 2; ++ /* allocate a new array */ ++ ++ new = ngx_palloc(p, 2 * size); ++ if (new == NULL) { ++ return NULL; ++ } ++ ++ ngx_memcpy(new, a->elts, size); ++ ++ link = ngx_palloc(p, sizeof(ngx_array_link_t)); ++ if (link == NULL) { ++ ngx_pfree(p, new); ++ return NULL; + } ++ ++ link->next = a->old_elts; ++ link->elts = a->elts; ++ a->old_elts = link; ++ ++ a->elts = new; ++ a->nalloc *= 2; + } + + elt = (u_char *) a->elts + a->size * a->nelts; +@@ -95,11 +97,10 @@ void * + ngx_array_push_n(ngx_array_t *a, ngx_uint_t n) + { + void *elt, *new; +- size_t size; + ngx_uint_t nalloc; + ngx_pool_t *p; + +- size = n * a->size; ++ ngx_array_link_t *link; + + if (a->nelts + n > a->nalloc) { + +@@ -107,31 +108,27 @@ ngx_array_push_n(ngx_array_t *a, ngx_uin + + p = a->pool; + +- if ((u_char *) a->elts + a->size * a->nalloc == p->d.last +- && p->d.last + size <= p->d.end) +- { +- /* +- * the array allocation is the last in the pool +- * and there is space for new allocation +- */ +- +- p->d.last += size; +- a->nalloc += n; +- +- } else { +- /* allocate a new array */ +- +- nalloc = 2 * ((n >= a->nalloc) ? n : a->nalloc); +- +- new = ngx_palloc(p, nalloc * a->size); +- if (new == NULL) { +- return NULL; +- } +- +- ngx_memcpy(new, a->elts, a->nelts * a->size); +- a->elts = new; +- a->nalloc = nalloc; ++ nalloc = 2 * ((n >= a->nalloc) ? n : a->nalloc); ++ ++ new = ngx_palloc(p, nalloc * a->size); ++ if (new == NULL) { ++ return NULL; ++ } ++ ++ ngx_memcpy(new, a->elts, a->nelts * a->size); ++ ++ link = ngx_palloc(p, sizeof(ngx_array_link_t)); ++ if (link == NULL) { ++ ngx_pfree(p, new); ++ return NULL; + } ++ ++ link->next = a->old_elts; ++ link->elts = a->elts; ++ a->old_elts = link; ++ ++ a->elts = new; ++ a->nalloc = nalloc; + } + + elt = (u_char *) a->elts + a->size * a->nelts; +diff -urp nginx-1.7.0/src/core/ngx_array.h nginx-1.7.0-patched/src/core/ngx_array.h +--- nginx-1.7.0/src/core/ngx_array.h 2014-01-22 05:43:00.000000000 -0800 ++++ nginx-1.7.0-patched/src/core/ngx_array.h 2014-01-27 21:25:14.888049518 -0800 +@@ -13,12 +13,23 @@ + #include + + ++typedef struct ngx_array_link_s ngx_array_link_t; ++ ++ ++struct ngx_array_link_s { ++ void *elts; ++ ngx_array_link_t *next; ++}; ++ ++ + typedef struct { + void *elts; + ngx_uint_t nelts; + size_t size; + ngx_uint_t nalloc; + ngx_pool_t *pool; ++ ++ ngx_array_link_t *old_elts; + } ngx_array_t; + + +@@ -40,6 +51,7 @@ ngx_array_init(ngx_array_t *array, ngx_p + array->size = size; + array->nalloc = n; + array->pool = pool; ++ array->old_elts = NULL; + + array->elts = ngx_palloc(pool, n * size); + if (array->elts == NULL) { +diff -urp nginx-1.7.0/src/core/ngx_palloc.c nginx-1.7.0-patched/src/core/ngx_palloc.c +--- nginx-1.7.0/src/core/ngx_palloc.c 2014-01-22 05:43:00.000000000 -0800 ++++ nginx-1.7.0-patched/src/core/ngx_palloc.c 2014-01-27 21:42:30.905552064 -0800 +@@ -9,32 +9,23 @@ + #include + + +-static void *ngx_palloc_block(ngx_pool_t *pool, size_t size); +-static void *ngx_palloc_large(ngx_pool_t *pool, size_t size); +- +- + ngx_pool_t * + ngx_create_pool(size_t size, ngx_log_t *log) + { +- ngx_pool_t *p; ++ ngx_pool_t *p; + +- p = ngx_memalign(NGX_POOL_ALIGNMENT, size, log); ++ size = sizeof(ngx_pool_t); ++ p = ngx_alloc(size, log); + if (p == NULL) { + return NULL; + } + +- p->d.last = (u_char *) p + sizeof(ngx_pool_t); +- p->d.end = (u_char *) p + size; +- p->d.next = NULL; +- p->d.failed = 0; ++ ngx_memzero(p, size); + + size = size - sizeof(ngx_pool_t); + p->max = (size < NGX_MAX_ALLOC_FROM_POOL) ? size : NGX_MAX_ALLOC_FROM_POOL; + + p->current = p; +- p->chain = NULL; +- p->large = NULL; +- p->cleanup = NULL; + p->log = log; + + return p; +@@ -44,8 +35,7 @@ ngx_create_pool(size_t size, ngx_log_t * + void + ngx_destroy_pool(ngx_pool_t *pool) + { +- ngx_pool_t *p, *n; +- ngx_pool_large_t *l; ++ ngx_pool_data_t *d, *n; + ngx_pool_cleanup_t *c; + + for (c = pool->cleanup; c; c = c->next) { +@@ -56,13 +46,9 @@ ngx_destroy_pool(ngx_pool_t *pool) + } + } + +- for (l = pool->large; l; l = l->next) { +- +- ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, "free: %p", l->alloc); +- +- if (l->alloc) { +- ngx_free(l->alloc); +- } ++ if (pool->d == NULL) { ++ ngx_free(pool); ++ return; + } + + #if (NGX_DEBUG) +@@ -72,9 +58,9 @@ ngx_destroy_pool(ngx_pool_t *pool) + * so we cannot use this log while free()ing the pool + */ + +- for (p = pool, n = pool->d.next; /* void */; p = n, n = n->d.next) { ++ for (d = pool->d, n = d->next; ; d = n, n = n->next) { + ngx_log_debug2(NGX_LOG_DEBUG_ALLOC, pool->log, 0, +- "free: %p, unused: %uz", p, p->d.end - p->d.last); ++ "free: %p, unused: %d", d, 0); + + if (n == NULL) { + break; +@@ -83,175 +69,84 @@ ngx_destroy_pool(ngx_pool_t *pool) + + #endif + +- for (p = pool, n = pool->d.next; /* void */; p = n, n = n->d.next) { +- ngx_free(p); ++ for (d = pool->d, n = d->next; ; d = n, n = n->next) { ++ ngx_free(d->alloc); ++ ngx_free(d); + + if (n == NULL) { + break; + } + } +-} + ++ pool->d = NULL; + +-void +-ngx_reset_pool(ngx_pool_t *pool) +-{ +- ngx_pool_t *p; +- ngx_pool_large_t *l; +- +- for (l = pool->large; l; l = l->next) { +- if (l->alloc) { +- ngx_free(l->alloc); +- } +- } +- +- for (p = pool; p; p = p->d.next) { +- p->d.last = (u_char *) p + sizeof(ngx_pool_t); +- p->d.failed = 0; +- } +- +- pool->current = pool; +- pool->chain = NULL; +- pool->large = NULL; ++ ngx_free(pool); + } + + +-void * +-ngx_palloc(ngx_pool_t *pool, size_t size) ++void ++ngx_reset_pool(ngx_pool_t *pool) + { +- u_char *m; +- ngx_pool_t *p; +- +- if (size <= pool->max) { ++ ngx_pool_data_t *d, *n; ++ ngx_pool_data_t *saved = NULL; + +- p = pool->current; +- +- do { +- m = ngx_align_ptr(p->d.last, NGX_ALIGNMENT); +- +- if ((size_t) (p->d.end - m) >= size) { +- p->d.last = m + size; +- +- return m; ++ if (pool->d) { ++ for (d = pool->d, n = d->next; ; d = n, n = n->next) { ++ if (d->alloc == pool->log) { ++ saved = d; ++ continue; + } + +- p = p->d.next; +- +- } while (p); +- +- return ngx_palloc_block(pool, size); +- } +- +- return ngx_palloc_large(pool, size); +-} +- +- +-void * +-ngx_pnalloc(ngx_pool_t *pool, size_t size) +-{ +- u_char *m; +- ngx_pool_t *p; +- +- if (size <= pool->max) { +- +- p = pool->current; +- +- do { +- m = p->d.last; +- +- if ((size_t) (p->d.end - m) >= size) { +- p->d.last = m + size; ++ ngx_free(d->alloc); ++ ngx_free(d); + +- return m; ++ if (n == NULL) { ++ break; + } ++ } + +- p = p->d.next; +- +- } while (p); +- +- return ngx_palloc_block(pool, size); ++ pool->d = saved; ++ pool->current = pool; ++ pool->chain = NULL; + } +- +- return ngx_palloc_large(pool, size); + } + + +-static void * +-ngx_palloc_block(ngx_pool_t *pool, size_t size) ++void * ++ngx_malloc(ngx_pool_t *pool, size_t size) + { +- u_char *m; +- size_t psize; +- ngx_pool_t *p, *new, *current; ++ ngx_pool_data_t *d; ++ void *p; + +- psize = (size_t) (pool->d.end - (u_char *) pool); +- +- m = ngx_memalign(NGX_POOL_ALIGNMENT, psize, pool->log); +- if (m == NULL) { ++ p = ngx_alloc(size, pool->log); ++ if (p == NULL) { + return NULL; + } + +- new = (ngx_pool_t *) m; +- +- new->d.end = m + psize; +- new->d.next = NULL; +- new->d.failed = 0; +- +- m += sizeof(ngx_pool_data_t); +- m = ngx_align_ptr(m, NGX_ALIGNMENT); +- new->d.last = m + size; +- +- current = pool->current; +- +- for (p = current; p->d.next; p = p->d.next) { +- if (p->d.failed++ > 4) { +- current = p->d.next; +- } ++ d = ngx_alloc(sizeof(ngx_pool_data_t), pool->log); ++ if (d == NULL){ ++ ngx_free(p); ++ return NULL; + } + +- p->d.next = new; +- +- pool->current = current ? current : new; +- +- return m; ++ d->alloc = p; ++ d->next = pool->d; ++ pool->d = d; ++ return p; + } + + +-static void * +-ngx_palloc_large(ngx_pool_t *pool, size_t size) ++void * ++ngx_palloc(ngx_pool_t *pool, size_t size) + { +- void *p; +- ngx_uint_t n; +- ngx_pool_large_t *large; +- +- p = ngx_alloc(size, pool->log); +- if (p == NULL) { +- return NULL; +- } +- +- n = 0; +- +- for (large = pool->large; large; large = large->next) { +- if (large->alloc == NULL) { +- large->alloc = p; +- return p; +- } +- +- if (n++ > 3) { +- break; +- } +- } +- +- large = ngx_palloc(pool, sizeof(ngx_pool_large_t)); +- if (large == NULL) { +- ngx_free(p); +- return NULL; +- } ++ return ngx_malloc(pool, size); ++} + +- large->alloc = p; +- large->next = pool->large; +- pool->large = large; + +- return p; ++void * ++ngx_pnalloc(ngx_pool_t *pool, size_t size) ++{ ++ return ngx_malloc(pool, size); + } + + +@@ -259,38 +154,48 @@ void * + ngx_pmemalign(ngx_pool_t *pool, size_t size, size_t alignment) + { + void *p; +- ngx_pool_large_t *large; ++ ngx_pool_data_t *d; + + p = ngx_memalign(alignment, size, pool->log); + if (p == NULL) { + return NULL; + } + +- large = ngx_palloc(pool, sizeof(ngx_pool_large_t)); +- if (large == NULL) { ++ d = ngx_alloc(sizeof(ngx_pool_data_t), pool->log); ++ if (d == NULL){ + ngx_free(p); + return NULL; + } + +- large->alloc = p; +- large->next = pool->large; +- pool->large = large; +- ++ d->alloc = p; ++ d->next = pool->d; ++ pool->d = d; + return p; + } + + + ngx_int_t +-ngx_pfree(ngx_pool_t *pool, void *p) ++ngx_pfree(ngx_pool_t *pool, void *data) + { +- ngx_pool_large_t *l; ++ ngx_pool_data_t *p, *d; + +- for (l = pool->large; l; l = l->next) { +- if (p == l->alloc) { +- ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, +- "free: %p", l->alloc); +- ngx_free(l->alloc); +- l->alloc = NULL; ++ p = NULL; ++ for (d = pool->d; d; p = d, d = d->next) { ++ if (data == d->alloc) { ++ ++ ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, "free: %p", d->alloc); ++ ++ ngx_free(d->alloc); ++ d->alloc = NULL; ++ ++ if (p) { ++ p->next = d->next; ++ ++ } else { ++ pool->d = d->next; ++ } ++ ++ ngx_free(d); + + return NGX_OK; + } +diff -urp nginx-1.7.0/src/core/ngx_palloc.h nginx-1.7.0-patched/src/core/ngx_palloc.h +--- nginx-1.7.0/src/core/ngx_palloc.h 2014-01-22 05:43:00.000000000 -0800 ++++ nginx-1.7.0-patched/src/core/ngx_palloc.h 2014-01-27 21:25:14.911049721 -0800 +@@ -38,28 +38,21 @@ struct ngx_pool_cleanup_s { + }; + + +-typedef struct ngx_pool_large_s ngx_pool_large_t; +- +-struct ngx_pool_large_s { +- ngx_pool_large_t *next; +- void *alloc; +-}; ++typedef struct ngx_pool_data_s ngx_pool_large_t; ++typedef struct ngx_pool_data_s ngx_pool_data_t; + + +-typedef struct { +- u_char *last; +- u_char *end; +- ngx_pool_t *next; +- ngx_uint_t failed; +-} ngx_pool_data_t; ++struct ngx_pool_data_s { ++ ngx_pool_data_t *next; ++ void *alloc; ++}; + + + struct ngx_pool_s { +- ngx_pool_data_t d; ++ ngx_pool_data_t *d; + size_t max; + ngx_pool_t *current; + ngx_chain_t *chain; +- ngx_pool_large_t *large; + ngx_pool_cleanup_t *cleanup; + ngx_log_t *log; + }; diff --git a/patches/nginx-1.7.0-pcre_conf_opt.patch b/patches/nginx-1.7.0-pcre_conf_opt.patch new file mode 100644 index 0000000..eb17e06 --- /dev/null +++ b/patches/nginx-1.7.0-pcre_conf_opt.patch @@ -0,0 +1,26 @@ +# HG changeset patch +# User Yichun Zhang +# Date 1386694955 28800 +# Node ID 9ba6b149669f1f02eeb4cdc0ebd364a949b5c469 +# Parent 30e806b8636af5fd3f03ec17df24801f390f7511 +Configure: added new option --with-pcre-conf-opt=OPTIONS. + +diff -r 30e806b8636a -r 9ba6b149669f auto/options +--- a/auto/options Mon Dec 09 10:16:44 2013 +0400 ++++ b/auto/options Tue Dec 10 09:02:35 2013 -0800 +@@ -286,6 +286,7 @@ + --with-pcre) USE_PCRE=YES ;; + --with-pcre=*) PCRE="$value" ;; + --with-pcre-opt=*) PCRE_OPT="$value" ;; ++ --with-pcre-conf-opt=*) PCRE_CONF_OPT="$value" ;; + --with-pcre-jit) PCRE_JIT=YES ;; + + --with-openssl=*) OPENSSL="$value" ;; +@@ -441,6 +442,7 @@ + --with-pcre force PCRE library usage + --with-pcre=DIR set path to PCRE library sources + --with-pcre-opt=OPTIONS set additional build options for PCRE ++ --with-pcre-conf-opt=OPTIONS set additional configure options for PCRE + --with-pcre-jit build PCRE with JIT compilation support + + --with-md5=DIR set path to md5 library sources diff --git a/patches/nginx-1.7.0-proxy_host_port_vars.patch b/patches/nginx-1.7.0-proxy_host_port_vars.patch new file mode 100644 index 0000000..6a4ba1f --- /dev/null +++ b/patches/nginx-1.7.0-proxy_host_port_vars.patch @@ -0,0 +1,15 @@ +--- nginx-1.7.0/src/http/modules/ngx_http_proxy_module.c 2013-10-08 05:07:14.000000000 -0700 ++++ nginx-1.7.0-patched/src/http/modules/ngx_http_proxy_module.c 2013-10-27 15:29:41.619378592 -0700 +@@ -602,10 +602,10 @@ static ngx_keyval_t ngx_http_proxy_cach + static ngx_http_variable_t ngx_http_proxy_vars[] = { + + { ngx_string("proxy_host"), NULL, ngx_http_proxy_host_variable, 0, +- NGX_HTTP_VAR_CHANGEABLE|NGX_HTTP_VAR_NOCACHEABLE|NGX_HTTP_VAR_NOHASH, 0 }, ++ NGX_HTTP_VAR_CHANGEABLE|NGX_HTTP_VAR_NOCACHEABLE, 0 }, + + { ngx_string("proxy_port"), NULL, ngx_http_proxy_port_variable, 0, +- NGX_HTTP_VAR_CHANGEABLE|NGX_HTTP_VAR_NOCACHEABLE|NGX_HTTP_VAR_NOHASH, 0 }, ++ NGX_HTTP_VAR_CHANGEABLE|NGX_HTTP_VAR_NOCACHEABLE, 0 }, + + { ngx_string("proxy_add_x_forwarded_for"), NULL, + ngx_http_proxy_add_x_forwarded_for_variable, 0, NGX_HTTP_VAR_NOHASH, 0 }, diff --git a/patches/nginx-1.7.0-server_header.patch b/patches/nginx-1.7.0-server_header.patch new file mode 100644 index 0000000..58ab90c --- /dev/null +++ b/patches/nginx-1.7.0-server_header.patch @@ -0,0 +1,24 @@ +diff -ur nginx-1.7.0/src/core/nginx.h nginx-1.7.0-patched/src/core/nginx.h +--- nginx-1.7.0/src/core/nginx.h 2010-02-12 17:31:01.000000000 +0800 ++++ nginx-1.7.0-patched/src/core/nginx.h 2010-03-30 10:52:13.240702627 +0800 +@@ -10,7 +10,7 @@ + + #define nginx_version 1007000 + #define NGINX_VERSION "1.7.0" +-#define NGINX_VER "nginx/" NGINX_VERSION ++#define NGINX_VER "openresty/" NGINX_VERSION ".unknown" + + #define NGINX_VAR "NGINX" + #define NGX_OLDPID_EXT ".oldbin" +diff -ur nginx-1.7.0/src/http/ngx_http_header_filter_module.c nginx-1.7.0-patched/src/http/ngx_http_header_filter_module.c +--- nginx-1.7.0/src/http/ngx_http_header_filter_module.c 2010-03-03 23:14:04.000000000 +0800 ++++ nginx-1.7.0-patched/src/http/ngx_http_header_filter_module.c 2010-03-30 10:52:53.670909405 +0800 +@@ -45,7 +45,7 @@ + }; + + +-static char ngx_http_server_string[] = "Server: nginx" CRLF; ++static char ngx_http_server_string[] = "Server: openresty" CRLF; + static char ngx_http_server_full_string[] = "Server: " NGINX_VER CRLF; + + diff --git a/patches/nginx-1.7.0-setting_args_invalidates_uri.patch b/patches/nginx-1.7.0-setting_args_invalidates_uri.patch new file mode 100644 index 0000000..c2fcd4c --- /dev/null +++ b/patches/nginx-1.7.0-setting_args_invalidates_uri.patch @@ -0,0 +1,44 @@ +# HG changeset patch +# User Yichun Zhang +# Date 1390506359 28800 +# Node ID 17186b98c235c07e94c64e5853689f790f173756 +# Parent 4b50d1f299d8a69f3e3f7975132e1490352642fe +Variable: setting $args should invalidate unparsed uri. + +diff -r 4b50d1f299d8 -r 17186b98c235 src/http/ngx_http_variables.c +--- a/src/http/ngx_http_variables.c Fri Jan 10 11:22:14 2014 -0800 ++++ b/src/http/ngx_http_variables.c Thu Jan 23 11:45:59 2014 -0800 +@@ -15,6 +15,8 @@ + ngx_http_variable_value_t *v, uintptr_t data); + static void ngx_http_variable_request_set(ngx_http_request_t *r, + ngx_http_variable_value_t *v, uintptr_t data); ++static void ngx_http_variable_request_args_set(ngx_http_request_t *r, ++ ngx_http_variable_value_t *v, uintptr_t data); + static ngx_int_t ngx_http_variable_request_get_size(ngx_http_request_t *r, + ngx_http_variable_value_t *v, uintptr_t data); + static void ngx_http_variable_request_set_size(ngx_http_request_t *r, +@@ -218,7 +220,7 @@ + NGX_HTTP_VAR_NOCACHEABLE, 0 }, + + { ngx_string("args"), +- ngx_http_variable_request_set, ++ ngx_http_variable_request_args_set, + ngx_http_variable_request, + offsetof(ngx_http_request_t, args), + NGX_HTTP_VAR_CHANGEABLE|NGX_HTTP_VAR_NOCACHEABLE, 0 }, +@@ -647,6 +649,15 @@ + + + static void ++ngx_http_variable_request_args_set(ngx_http_request_t *r, ++ ngx_http_variable_value_t *v, uintptr_t data) ++{ ++ r->valid_unparsed_uri = 0; ++ ngx_http_variable_request_set(r, v, data); ++} ++ ++ ++static void + ngx_http_variable_request_set(ngx_http_request_t *r, + ngx_http_variable_value_t *v, uintptr_t data) + { diff --git a/patches/nginx-1.7.0-upstream_pipelining.patch b/patches/nginx-1.7.0-upstream_pipelining.patch new file mode 100644 index 0000000..16664e6 --- /dev/null +++ b/patches/nginx-1.7.0-upstream_pipelining.patch @@ -0,0 +1,40 @@ +diff -rudp nginx-1.7.0/src/http/ngx_http_upstream.c nginx-1.7.0-patched/src/http/ngx_http_upstream.c +--- nginx-1.7.0/src/http/ngx_http_upstream.c 2012-08-06 10:34:08.000000000 -0700 ++++ nginx-1.7.0-patched/src/http/ngx_http_upstream.c 2012-12-05 14:46:41.741173058 -0800 +@@ -1216,6 +1216,7 @@ ngx_http_upstream_connect(ngx_http_reque + } + + u->request_sent = 0; ++ u->request_all_sent = 0; + + if (rc == NGX_AGAIN) { + ngx_add_timer(c->write, u->conf->connect_timeout); +@@ -1418,6 +1419,8 @@ ngx_http_upstream_send_request(ngx_http_ + + /* rc == NGX_OK */ + ++ u->request_all_sent = 1; ++ + if (c->tcp_nopush == NGX_TCP_NOPUSH_SET) { + if (ngx_tcp_push(c->fd) == NGX_ERROR) { + ngx_log_error(NGX_LOG_CRIT, c->log, ngx_socket_errno, +@@ -1484,7 +1487,7 @@ ngx_http_upstream_send_request_handler(n + + #endif + +- if (u->header_sent) { ++ if (u->request_all_sent) { + u->write_event_handler = ngx_http_upstream_dummy_handler; + + (void) ngx_handle_write_event(c->write, 0); +diff -rudp nginx-1.7.0/src/http/ngx_http_upstream.h nginx-1.7.0-patched/src/http/ngx_http_upstream.h +--- nginx-1.7.0/src/http/ngx_http_upstream.h 2012-02-13 03:01:58.000000000 -0800 ++++ nginx-1.7.0-patched/src/http/ngx_http_upstream.h 2012-12-05 14:41:09.763514741 -0800 +@@ -324,6 +324,7 @@ struct ngx_http_upstream_s { + unsigned keepalive:1; + + unsigned request_sent:1; ++ unsigned request_all_sent:1; + unsigned header_sent:1; + }; + diff --git a/util/mirror-tarballs b/util/mirror-tarballs index 5cf3f62..193f3e2 100755 --- a/util/mirror-tarballs +++ b/util/mirror-tarballs @@ -141,9 +141,12 @@ if [ "$answer" = "N" ]; then echo fi -echo "$info_txt applying the slab_alloc_no_memory_as_info patch for nginx" -patch -p1 < $root/patches/nginx-$main_ver-slab_alloc_no_memory_as_info.patch || exit 1 -echo +answer=`$root/util/ver-ge "$main_ver" 1.5.13` +if [ "$answer" = "N" ]; then + echo "$info_txt applying the slab_alloc_no_memory_as_info patch for nginx" + patch -p1 < $root/patches/nginx-$main_ver-slab_alloc_no_memory_as_info.patch || exit 1 + echo +fi answer=`$root/util/ver-ge "$main_ver" 1.2.7` if [ "$answer" = "N" ]; then diff --git a/util/ver b/util/ver index 8fd71ed..bf412f6 100755 --- a/util/ver +++ b/util/ver @@ -1,7 +1,7 @@ #!/bin/bash -main_ver=1.5.12 -minor_ver=1 +main_ver=1.7.0 +minor_ver=1rc1 version=$main_ver.$minor_ver echo $version