passenger 4.0.59 → 4.0.60

data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/auto/data/action_replacements

@@ -0,0 +1,5 @@
+
+OK      NGX_OK
+E       NGX_ERROR
+CE      NGX_CONF_ERROR
+COK     NGX_CONF_OK

data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/auto/data/action_types

@@ -0,0 +1,12 @@
+r0          return 0
+r1          return 1
+r_1         return -1
+rok         return %OK%
+rce         return %CE%
+rcok        return %COK%
+re          return %E%
+rn          return NULL
+rse         {ngx_script_error (e); return;}
+sce         {ngx_script_configure_error (c); return;}
+g(_lb)      goto _lb
+ge          goto error

data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/auto/data/conf_args

@@ -0,0 +1,22 @@
+ 
+TAKE1
+TAKE2
+TAKE3
+TAKE4
+TAKE5
+TAKE6
+TAKE7
+TAKE8
+TAKE12
+TAKE13
+TAKE23
+TAKE123
+TAKE1234
+1MORE
+2MORE
+ANY
+FLAG
+BLOCK
+MULTI
+ARGS_NUMBER
+

data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/auto/data/conf_locs

@@ -0,0 +1,25 @@
+
+HTTP_MAIN                   HTTP_MAIN       main
+HTTP_SRV                    HTTP_SRV        srv
+HTTP_SIF                    HTTP_SRV        srv
+HTTP_LOC                    HTTP_LOC        loc
+HTTP_LIF                    HTTP_LOC        loc
+
+HTTP_MAIN_SRV               HTTP_SRV        srv
+HTTP_MAIN_SIF               HTTP_SRV        srv
+HTTP_MAIN_LOC               HTTP_LOC        loc
+HTTP_MAIN_LIF               HTTP_LOC        loc
+
+HTTP_SRV_LOC                HTTP_LOC        loc
+HTTP_SRV_LIF                HTTP_LOC        loc
+HTTP_SIF_LOC                HTTP_LOC        loc
+HTTP_SIF_LIF                HTTP_LOC        loc
+
+HTTP_MAIN_SRV_LOC           HTTP_LOC        loc
+HTTP_MAIN_SRV_LIF           HTTP_LOC        loc
+HTTP_MAIN_SIF_LOC           HTTP_LOC        loc
+HTTP_MAIN_SRV_SIF_LOC       HTTP_LOC        loc
+HTTP                        HTTP_LOC        loc
+HTTP_UPS                    HTTP_LOC        loc
+HTTP_ANY                    HTTP_LOC        loc
+ANY                         HTTP_LOC        loc

data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/auto/data/conf_macros

@@ -0,0 +1,35 @@
+
+BITMASK             1MORE       bitmask
+BUFS                TAKE1       bufs
+COMPLEX_KEYVAL      TAKE2       http_complex_keyval
+COMPLEX_PATH        TAKE1       http_complex_path
+COMPLEX_VALUE       TAKE1       http_complex_value
+COMPLEX_VALUE_ARRAY 1MORE       http_complex_value_array
+ENCODING            TAKE1       encoding
+ENUM                TAKE1       enum
+FALSE               NOARGS      false
+FULL_PATH           TAKE1       full_path
+KEYVAL              TAKE2       keyval
+KEYVAL1             TAKE2       keyval1
+MSEC                TAKE1       msec
+NULL                NOARGS      null
+NUM                 TAKE1       num
+NUM64               TAKE1       num64
+NUM_FLAG            TAKE1       num_flag
+ONOFF               FLAG        flag
+OFF                 TAKE1       off
+PATH                TAKE1       split_path
+REXEX               TAKE1       regex
+REGEX_CL            TAKE1       regex_caseless
+REGEX_ARRAY         1MORE       regex_array
+REGEX_ARRAY_CL      1MORE       regex_array_caseless
+PTR                 NOARGS      ptr
+SEC                 TAKE1       sec
+SEC_FLAG            TAKE2       sec_flag
+SIZE                TAKE1       size
+STR                 TAKE1       str
+STR_ARRAY           1MORE       str_array_multi
+STR_ARRAY1          TAKE1       str_array
+TRUE                NOARGS      true
+
+ 

data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/auto/data/contexts

@@ -0,0 +1,22 @@
+ 
+MAIN
+SRV
+SIF
+LOC
+LIF
+
+MAIN_SRV
+MAIN_SIF
+MAIN_LOC
+MAIN_LIF
+SRV_LOC
+SRV_LIF
+SIF_LOC
+SIF_LIF
+
+MAIN_SRV_LOC
+MAIN_SRV_LIF
+MAIN_SIF_LOC
+MAIN_SIF_LIF
+ANY_MAIN
+

data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/auto/data/header_files

@@ -0,0 +1,3 @@
+array
+palloc
+

data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/auto/data/headers

@@ -0,0 +1,4 @@
+http_headers
+log
+parse
+string_util

data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/auto/data/module_dependencies

@@ -0,0 +1,5 @@
+complex_path    complex_value   path
+conf_file       string
+hash            string
+set_var         rewrite
+upstream_list   http_create_main_conf

data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/auto/data/modules_optional

@@ -0,0 +1,15 @@
+buf
+complex_path
+complex_value
+conf_file
+encoding
+hash
+http
+path
+process
+regex
+rewrite
+set_var
+string
+upstream_list   *
+uri

data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/auto/data/prefixes

@@ -0,0 +1,2 @@
+ngx
+ndk 

data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/auto/src/array.h

@@ -0,0 +1,7 @@
+
+#define     %2%_array_count(a)                  ((a)->nelts)
+#define     %2%_array_get_first(a)              ((a)->elts)
+#define     %2%_array_get_index(a,n)            ((void*) ((char*) (a)->elts + (a)->size * n))
+#define     %2%_array_get_last(a)               ((void*) ((char*) (a)->elts + (a)->size * ((a)->nelts - 1)))
+#define     %2%_array_get_reverse_index(a,n)    ((void*) ((char*) (a)->elts + (a)->size * ((a)->nelts - 1 - n)))
+#define     %2%_array_push_clean(p,a)           {p = %1%_array_push (a); %2%_zerop (p);}

data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/auto/src/conf_cmd_basic.h

@@ -0,0 +1,43 @@
+
+/* TODO : finish this */
+
+#define     NDK_HTTP_MAIN_CONF              NGX_HTTP_MAIN_CONF
+#define     NDK_HTTP_SRV_CONF               NGX_HTTP_SRV_CONF
+#define     NDK_HTTP_SIF_CONF               NGX_HTTP_SIF_CONF
+#define     NDK_HTTP_LOC_CONF               NGX_HTTP_LOC_CONF
+#define     NDK_HTTP_LIF_CONF               NGX_HTTP_LIF_CONF
+#define     NDK_HTTP_UPS_CONF               NGX_HTTP_UPS_CONF
+#define     NDK_MAIN_CONF                   NGX_MAIN_CONF
+#define     NDK_ANY_CONF                    NGX_ANY_CONF
+
+
+/* compound locations */
+
+#define     NDK_HTTP_MAIN_SRV_CONF                  NDK_HTTP_MAIN_CONF|NDK_HTTP_SRV_CONF
+#define     NDK_HTTP_MAIN_SIF_CONF                  NDK_HTTP_MAIN_CONF|NDK_HTTP_SRV_SIF_CONF
+#define     NDK_HTTP_MAIN_LOC_CONF                  NDK_HTTP_MAIN_CONF|NDK_HTTP_LOC_CONF
+#define     NDK_HTTP_MAIN_LIF_CONF                  NDK_HTTP_MAIN_CONF|NDK_HTTP_LOC_LIF_CONF
+
+#define     NDK_HTTP_SRV_SIF_CONF                   NDK_HTTP_SRV_CONF|NDK_HTTP_SIF_CONF
+#define     NDK_HTTP_SRV_LOC_CONF                   NDK_HTTP_SRV_CONF|NDK_HTTP_LOC_CONF
+#define     NDK_HTTP_SRV_LOC_LIF_CONF               NDK_HTTP_SRV_CONF|NDK_HTTP_LOC_LIF_CONF
+#define     NDK_HTTP_SRV_SIF_LOC_CONF               NDK_HTTP_SRV_SIF_CONF|NDK_HTTP_LOC_CONF
+#define     NDK_HTTP_SRV_SIF_LOC_LIF_CONF           NDK_HTTP_SRV_SIF_CONF|NDK_HTTP_LOC_LIF_CONF
+
+#define     NDK_HTTP_LOC_LIF_CONF                   NDK_HTTP_LOC_CONF|NDK_HTTP_LIF_CONF
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF              NDK_HTTP_MAIN_CONF|NDK_HTTP_SRV_LOC_CONF
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF              NDK_HTTP_MAIN_CONF|NDK_HTTP_SRV_LIF_CONF
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF              NDK_HTTP_MAIN_CONF|NDK_HTTP_SIF_LOC_CONF
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_LIF_CONF      NDK_HTTP_SRV_SIF_LOC_LIF_CONF|NDK_MAIN_CONF
+#define     NDK_HTTP_CONF                           NDK_HTTP_MAIN_SRV_SIF_LOC_LIF_CONF
+#define     NDK_HTTP_ANY_CONF                       NDK_HTTP_CONF|NDK_HTTP_UPS_CONF
+
+
+/* property offsets     NOTE : ngx_module_main_conf_t etc should be defined in the module's .c file before the commands */
+
+#define     NDK_HTTP_MAIN_CONF_PROP(p)      NGX_HTTP_MAIN_CONF_OFFSET, offsetof (ndk_module_main_conf_t, p)
+#define     NDK_HTTP_SRV_CONF_PROP(p)       NGX_HTTP_SRV_CONF_OFFSET, offsetof (ndk_module_srv_conf_t, p)
+#define     NDK_HTTP_LOC_CONF_PROP(p)       NGX_HTTP_LOC_CONF_OFFSET, offsetof (ndk_module_loc_conf_t, p)
+
+

data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/auto/src/conf_merge.h

@@ -0,0 +1,78 @@
+
+/* TODO : check that all the main types have a corresponding merge function */
+
+#define     ndk_conf_merge_value            ngx_conf_merge_value
+#define     ndk_conf_merge_off_value        ngx_conf_merge_off_value 
+#define     ndk_conf_merge_ptr_value        ngx_conf_merge_ptr_value
+#define     ndk_conf_merge_str_value        ngx_conf_merge_str_value
+#define     ndk_conf_merge_size_value       ngx_conf_merge_size_value 
+
+
+#define     ndk_conf_merge_keyval_value(conf,prev,default)                                  \
+                                                                                            \
+                conf = prev ? prev : default;
+
+#define     ndk_conf_merge_str_array_value(conf,prev,val1,...)                              \
+                                                                                            \
+                if (conf == NGX_CONF_UNSET_PTR) {                                           \
+                    if (prev == NGX_CONF_UNSET_PTR) {                                       \
+                        if (val1 == NULL) {                                                 \
+                            conf = NULL;                                                    \
+                        } else {                                                            \
+                            char * elts[] = {val1,##__VA_ARGS__};                           \
+                            int    n = sizeof(elts)/sizeof(char*);                          \
+                                                                                            \
+                            conf = ndk_str_array_create (cf->pool, elts, n);                \
+                                                                                            \
+                            if (conf == NULL)                                               \
+                                return  NGX_CONF_ERROR;                                     \
+                        }                                                                   \
+                    } else {                                                                \
+                        conf = prev;                                                        \
+                    }                                                                       \
+                }
+
+#define     ndk_conf_merge_http_complex_value_value(conf,prev,default)                      \
+                                                                                            \
+                if (!conf.str.len) {                                                        \
+                    if (prev.str.len) {                                                     \
+                        conf = prev;                                                        \
+                    } else {                                                                \
+                        conf.str.data = (u_char *) default;                                 \
+                        conf.str.len = sizeof (default) - 1;                                \
+                                                                                            \
+                        if (ndk_http_complex_value_compile (cf, &conf))                     \
+                            return  NGX_CONF_ERROR;                                         \
+                    }                                                                       \
+                }
+
+#define     ndk_conf_merge_http_complex_value_array_value(conf,prev,val1,...)               \
+                                                                                            \
+                if (conf == NGX_CONF_UNSET_PTR) {                                           \
+                    if (prev == NGX_CONF_UNSET_PTR) {                                       \
+                        if (val1 == NULL)                                                   \
+                            conf = NULL;                                                    \
+                        else {                                                              \
+                            char * elts[] = {val1,##__VA_ARGS__};                           \
+                            int    n = sizeof(elts)/sizeof(char*);                          \
+                                                                                            \
+                            conf = ndk_http_complex_value_array_create (cf, elts, n);       \
+                                                                                            \
+                            if (conf == NULL)                                               \
+                                return  NGX_CONF_ERROR;                                     \
+                        }                                                                   \
+                    } else {                                                                \
+                        conf = prev;                                                        \
+                    }                                                                       \
+                }
+
+#define     ndk_conf_merge_http_complex_path_value(conf,prev,...)                           \
+                ndk_conf_merge_http_complex_value_array_value (conf.a, prev.a, __VA_ARGS__)
+
+#define     ndk_conf_merge_split_path_value(conf,prev,path)                                 \
+                                                                                            \
+                if (conf == NGX_CONF_UNSET_PTR)  {                                          \
+                    conf = (prev == NGX_CONF_UNSET_PTR ?                                    \
+                        ndk_split_path_create_raw (cf, path) : prev);                       \
+                }
+

data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/auto/src/palloc.h

@@ -0,0 +1,6 @@
+
+#define     %2%_pallocp(p,pl)                   p = %1%_palloc (pl,sizeof(*p))
+#define     %2%_pallocpn(p,pl,n)                p = %1%_palloc (pl,sizeof(*p)*(n))
+
+#define     %2%_pcallocp(p,pl)                  p = %1%_pcalloc (pl,sizeof(*p))
+#define     %2%_pcallocpn(p,pl,n)               p = %1%_pcalloc (pl,sizeof(*p)*(n))

data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/auto/text/autogen

@@ -0,0 +1,12 @@
+
+/* 
+ * 2010 (C) Marcus Clyne 
+ *
+ * DO NOT EDIT THIS FILE MANUALLY
+ * ------------------------------
+ * This file has been generated automatically from scripts in the $base/auto dir and
+ * data in the $base/auto/data dir. If you wish to edit the output of this file, then
+ * you should edit these files instead.
+ *
+*/
+

data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/config

@@ -0,0 +1,49 @@
+
+###############
+## FUNCTIONS ##
+###############
+
+# TODO : provide information about checking versions of sed etc
+# TODO : an optional patch function
+
+ndk_generate_files() {
+    echo "building Nginx Development Kit utility functions and macros ..."
+
+    autobuild="$ngx_addon_dir/auto/build"
+    chmod +x $autobuild
+    $autobuild `pwd` $NGX_OBJS/addon/ndk || exit 1
+}
+
+ndk_get_nginx_version() {
+    # We get the Nginx version number from the string form rather than
+    # nginx_version because it is available in more (every?) version
+
+    cat src/core/nginx.h                                | 
+    grep  '#define NGINX_VERSION'                       | 
+    sed -r                                              \
+        -e 's/[^0-9.]*([0-9.]+).*/\1/'                  \
+        -e 's/([0-9]+\.[0-9]+\.)([0-9]{1})$/\100\2/'    \
+        -e 's/([0-9]+\.[0-9]+\.)([0-9]{2})$/\10\2/'     \
+        -e 's/\.//g'                                    \
+        -e 's/^0+(.*)/\1/'
+}
+
+#####################
+## CONFIG SETTINGS ##
+#####################
+
+ngx_addon_name=ngx_devel_kit
+ngx_objs_dirs="$ngx_addon_dir/objs $NGX_OBJS/addon/ndk"
+
+CORE_INCS="$CORE_INCS $ngx_objs_dirs"
+HTTP_INCS="$HTTP_INCS $ngx_addon_dir/src $ngx_objs_dir"
+HTTP_MODULES="$HTTP_MODULES ndk_http_module"
+NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/src/ndk.c"
+
+have=NDK . auto/have
+
+##############
+## INCLUDES ##
+##############
+
+. $ngx_addon_dir/ngx_auto_lib_core

data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/docs/core/action_macros

@@ -0,0 +1,63 @@
+
+    GENERAL NOTES
+    -------------
+
+    These functions and macros have been provided as a tool for Nginx module developers.  They have
+    been created with four main purposes:
+
+        - to speed up code-writing
+        - to reduce the code you have to read on file
+        - to add additional generic functionality similar to exising Nginx functions 
+        - to reduce code errors
+
+    Most of the utility macros are just wrappers around commonly used code, especially checking for
+    NULL and returning a value, zeroing data etc.  The functions add things like extra conf_set_X_slot
+    functions that don't exist in the standard Nginx distribution, but which might be useful in more
+    than one module.
+
+    A consistent approach has been taken to creating the macros, so that in theory you should be able
+    to 'know' the macro name from using the few rules below and your knowledge of the existing Nginx
+    functions.  As much as possible, the ordering of variables used within the underlying functions
+    remain the same, to reduce the learning time.  Also, a constent naming pattern has been used to
+    make it easier to read the macros above.
+
+    Obviously not all programmers will want to use all or any of these macros, but they are provided
+    as a tool for those who wish to use them.
+
+    If you have any comments about them, including any additions or errors please let me know at 
+    'eugaia at gmail dot com'.  I don't promise to include all additions people send, but if they seem
+    like they could be of use to multiple developers, I will.
+
+
+    UTILITY MACRO PARAMS
+    --------------------
+    p       pointer                 - used to set the result of a function to a pointer
+    a       array
+    pl      pool
+    n       multiplication factor   - for allocating multiple pointers & pushing 'n' elts in arrays etc
+    sz      size
+    l       log
+    rv      return value
+
+
+
+    UTILITY MACRO FUNCTION SUFFIXES
+    -------------------------------
+
+ - general
+
+    p       p = [FUNCTION] ()
+    _r      [ if result of function is NULL | NGX_ERROR (as appropriate) ] return rv
+    _rce    rv = NGX_CONF_ERROR
+    _re     rv = NGX_ERROR
+    _rn     rv = NULL
+
+ - (p)(c)alloc functions
+
+    p       p = [function] (pool, sizeof (*p))
+    pn      p = [function] (pool, sizeof (*p) * n)
+
+
+    UTILITY MACRO PARAMS ORDER
+    --------------------------
+    p, pl|a, sz|n, l, rv 

data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/docs/core/conf_cmds

@@ -0,0 +1,62 @@
+
+Conf command macros
+-------------------
+
+The build script generates a large number of macros for reducing the code required for command
+definitions.
+
+There are basically three types of macros :
+
+- combination bitmasks
+
+    e.g. NDK_HTTP_MAIN_SRV_CONF  =  (NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF)
+
+- base command structures
+
+    e.g. NDK_HTTP_MAIN_CONF_TAKE1
+
+- conf-set command structures
+
+    e.g. NDK_HTTP_CONF_STR
+
+
+Combination bitmasks
+--------------------
+
+Basically combinations of existing bitmasks for locations, with general > specific order
+
+NDK_HTTP_CONF = (NGX_HTTP_MAIN_CONF | NGX_HTTP_SVR_CONF | NGX_HTTP_SIF_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF)
+
+
+Base command structures
+-----------------------
+
+These macros are basically there as wrappers for the conf-set command structures, and but incorporate 
+the bitmask element into the name of the macro.
+
+
+Conf-set command structures
+---------------------------
+
+These macros simplify creating commands that use any of the build-in conf-set functions or any of those
+added by the NDK.
+
+e.g.  NGX_HTTP_MAIN_SRV_STR ("name", prop, NULL)
+
+where prop is the name of the property that is a ngx_str_t.  Whether this is in the loc conf, main conf
+or svr conf is generated automatically in by the macro.
+
+NOTE : you need to set the following if they will be used (using macro definitions) :
+
+ndk_module_main_conf_t
+ndk_module_srv_conf_t
+ndk_module_loc_conf_t
+
+e.g
+
+#define     ndk_module_loc_conf_t       ngx_http_my_module_loc_conf_t
+
+
+TODO
+----
+Much better documentation for this