updated the dtrace patches for nginx 1.2.3 and 1.3.4 for FreeBSD. als…

…o updated the bundling scripts to make them work on FreeBSD.
openresty · Aug 17, 2012 · 654bd20 · 654bd20
1 parent afcd9fe
commit 654bd20
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/patches/nginx-1.2.3-dtrace.patch b/patches/nginx-1.2.3-dtrace.patch
@@ -610,7 +610,7 @@ index 3e077fb..b7edb7b 100644
                  return NGX_CONF_ERROR;
              }
 diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
-index c5db18f..f23ba51 100644
+index c5db18f..ffc7049 100644
 --- a/src/http/ngx_http_core_module.c
 +++ b/src/http/ngx_http_core_module.c
 @@ -8,6 +8,7 @@
@@ -625,7 +625,7 @@ index c5db18f..f23ba51 100644
      r->main->subrequests--;
 
      if (r->main->subrequests == 0) {
-+        ngx_http_probe_subrequest_cycle(r, &uri, &args);
++        ngx_http_probe_subrequest_cycle(r, uri, args);
 +
          ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
                        "subrequests cycle while processing \"%V\"", uri);

diff --git a/patches/nginx-1.3.4-dtrace.patch b/patches/nginx-1.3.4-dtrace.patch
@@ -625,7 +625,7 @@ index c5db18f..f23ba51 100644
      r->main->subrequests--;
 
      if (r->main->subrequests == 0) {
-+        ngx_http_probe_subrequest_cycle(r, &uri, &args);
++        ngx_http_probe_subrequest_cycle(r, uri, args);
 +
          ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
                        "subrequests cycle while processing \"%V\"", uri);

diff --git a/util/get-tarball b/util/get-tarball
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #root=$(readlink -f -- "$(dirname -- "$0")/..")
 root=`perl -MCwd -e'print Cwd::abs_path(shift)' $(dirname -- "$0")/..`