diff options
| author | nginx <nginx@nginx.org> | 2013-02-05 14:21:59 +0000 |
|---|---|---|
| committer | Jon Kolb <jon@b0g.us> | 2013-02-05 14:21:59 +0000 |
| commit | bf3178867712d61cd5bb7692e6f837c4b0c51d8c (patch) | |
| tree | ca4d6e173b19bdf2f8dc62fe5ca2dfd8ff6cfcd2 /auto | |
| parent | 61c2753477f8ea559ebf67c8bc8276a9804ecd5a (diff) | |
| download | nginx-bf3178867712d61cd5bb7692e6f837c4b0c51d8c.tar.gz | |
Changes with nginx 1.3.12 05 Feb 2013v1.3.12
*) Feature: variables support in the "proxy_bind", "fastcgi_bind",
"memcached_bind", "scgi_bind", and "uwsgi_bind" directives.
*) Feature: the $pipe, $request_length, $time_iso8601, and $time_local
variables can now be used not only in the "log_format" directive.
Thanks to Kiril Kalchev.
*) Feature: IPv6 support in the ngx_http_geoip_module.
Thanks to Gregor Kališnik.
*) Bugfix: in the "proxy_method" directive.
*) Bugfix: a segmentation fault might occur in a worker process if
resolver was used with the poll method.
*) Bugfix: nginx might hog CPU during SSL handshake with a backend if
the select, poll, or /dev/poll methods were used.
*) Bugfix: the "[crit] SSL_write() failed (SSL:)" error.
*) Bugfix: in the "client_body_in_file_only" directive; the bug had
appeared in 1.3.9.
*) Bugfix: in the "fastcgi_keep_conn" directive.
Diffstat (limited to 'auto')
| -rw-r--r-- | auto/cc/msvc | 3 | ||||
| -rw-r--r-- | auto/lib/geoip/conf | 19 | ||||
| -rw-r--r-- | auto/lib/libgd/conf | 2 |
3 files changed, 18 insertions, 6 deletions
diff --git a/auto/cc/msvc b/auto/cc/msvc index a99d5a92c..1bf675e19 100644 --- a/auto/cc/msvc +++ b/auto/cc/msvc @@ -73,9 +73,6 @@ CFLAGS="$CFLAGS -WX" # disable logo CFLAGS="$CFLAGS -nologo" - -LINK="\$(CC)" - # the link flags CORE_LINK="$CORE_LINK -link -verbose:lib" diff --git a/auto/lib/geoip/conf b/auto/lib/geoip/conf index 3764d7649..53c274d54 100644 --- a/auto/lib/geoip/conf +++ b/auto/lib/geoip/conf @@ -6,7 +6,7 @@ ngx_feature="GeoIP library" ngx_feature_name= ngx_feature_run=no - ngx_feature_incs= + ngx_feature_incs="#include <GeoIP.h>" ngx_feature_path= ngx_feature_libs="-lGeoIP" ngx_feature_test="GeoIP_open(NULL, 0)" @@ -18,6 +18,7 @@ if [ $ngx_found = no ]; then # FreeBSD port ngx_feature="GeoIP library in /usr/local/" + ngx_feature_path="/usr/local/include" if [ $NGX_RPATH = YES ]; then ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -lGeoIP" @@ -34,7 +35,7 @@ if [ $ngx_found = no ]; then # NetBSD port ngx_feature="GeoIP library in /usr/pkg/" - ngx_feature_path="/usr/pkg/include/" + ngx_feature_path="/usr/pkg/include" if [ $NGX_RPATH = YES ]; then ngx_feature_libs="-R/usr/pkg/lib -L/usr/pkg/lib -lGeoIP" @@ -64,8 +65,22 @@ fi if [ $ngx_found = yes ]; then + + CORE_INCS="$CORE_INCS $ngx_feature_path" CORE_LIBS="$CORE_LIBS $ngx_feature_libs" + if [ $NGX_IPV6 = YES ]; then + ngx_feature="GeoIP IPv6 support" + ngx_feature_name="NGX_HAVE_GEOIP_V6" + ngx_feature_run=no + ngx_feature_incs="#include <stdio.h> + #include <GeoIP.h>" + #ngx_feature_path= + #ngx_feature_libs= + ngx_feature_test="printf(\"%d\", GEOIP_CITY_EDITION_REV0_V6);" + . auto/feature + fi + else cat << END diff --git a/auto/lib/libgd/conf b/auto/lib/libgd/conf index b0bc74c15..ff99054db 100644 --- a/auto/lib/libgd/conf +++ b/auto/lib/libgd/conf @@ -35,7 +35,7 @@ if [ $ngx_found = no ]; then # NetBSD port ngx_feature="GD library in /usr/pkg/" - ngx_feature_path="/usr/pkg/include/" + ngx_feature_path="/usr/pkg/include" if [ $NGX_RPATH = YES ]; then ngx_feature_libs="-R/usr/pkg/lib -L/usr/pkg/lib -lgd" |