passenger 4.0.59 → 4.0.60

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

@@ -0,0 +1,44 @@
+
+
+/* conf set functions */
+
+char *  ndk_conf_set_true_slot              (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+char *  ndk_conf_set_false_slot             (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+char *  ndk_conf_set_full_path_slot         (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+char *  ndk_conf_set_ptr_slot               (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+char *  ndk_conf_set_null_slot              (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+char *  ndk_conf_set_str_array_multi_slot   (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+char *  ndk_conf_set_keyval1_slot           (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+char *  ndk_conf_set_num_flag               (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+char *  ndk_conf_set_num64_slot             (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+char *  ndk_conf_set_sec_flag_slot          (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+
+ngx_http_conf_ctx_t *   ndk_conf_create_http_location           (ngx_conf_t *cf);
+ngx_http_conf_ctx_t *   ngx_conf_create_http_named_location     (ngx_conf_t *cf, ngx_str_t *name);
+
+ngx_int_t               ndk_replace_command     (ngx_command_t *new_cmd, ngx_uint_t module_type);
+
+
+/* values for conf_set_xxx_flag */
+
+#define     NDK_CONF_SET_TRUE       -2
+#define     NDK_CONF_SET_FALSE      -3
+
+
+/* wrappers for utility macros */
+
+#define     ndk_conf_set_bitmask_slot       ngx_conf_set_bitmask_slot
+#define     ndk_conf_set_bufs_slot          ngx_conf_set_bufs_slot
+#define     ndk_conf_set_enum_slot          ngx_conf_set_enum_slot
+#define     ndk_conf_set_flag_slot          ngx_conf_set_flag_slot
+#define     ndk_conf_set_keyval_slot        ngx_conf_set_keyval_slot
+#define     ndk_conf_set_msec_slot          ngx_conf_set_msec_slot
+#define     ndk_conf_set_num_slot           ngx_conf_set_num_slot
+#define     ndk_conf_set_off_slot           ngx_conf_set_off_slot
+#define     ndk_conf_set_sec_slot           ngx_conf_set_sec_slot
+#define     ndk_conf_set_size_slot          ngx_conf_set_size_slot
+#define     ndk_conf_set_str_slot           ngx_conf_set_str_slot
+
+
+
+

data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/src/ndk_debug.c

@@ -0,0 +1,72 @@
+
+#if (NGX_DEBUG)
+
+void
+ndk_debug_helper (const char *func, const char *fmt, ...)
+{
+    size_t   len, flen, tlen;
+    char    *s, *p, *e;
+
+    /* check to see if the format is empty */
+
+    flen = strlen (fmt);
+
+    /* build func name */
+
+    len = strlen (func);
+
+    if (flen == 0)
+        tlen = len + 1;
+    else
+
+    char    func_name [len + flen + 1];
+
+    s = func_name;
+    e = s + len;
+
+    memcpy (s, func, len);
+
+    /* remove initial ngx_ */
+
+    if (strncmp (s, "ngx_", 4) == 0)
+        s += 4;
+
+    /* replace '_' with ' ' */
+
+    for (p=s; p<e; p++) {
+        if (*p == '_')
+            *p = ' ';
+    }
+
+    vfprintf (stderr, const char *format, va_list ap)
+}
+
+
+void
+ndk_debug_request_helper (const char *func, ngx_http_request_t *r)
+{
+    ngx_http_posted_request_t       *pr;
+
+    /* TODO : improve the format */
+
+    fprintf (stderr, "%s %.*s %.*s?%.*s c:%d m:%p r:%p ar:%p pr:%p",
+            func,
+            (int) r->method_name.len, r->method_name.data,
+            (int) r->uri.len, r->uri.data,
+            (int) r->args.len, r->args.data,
+            0/*(int) r->main->count*/, r->main,
+            r, r->connection->data, r->parent);
+
+    if (r->posted_requests) {
+        fprintf(stderr, " posted:");
+
+        for (pr = r->posted_requests; pr; pr = pr->next) {
+            fprintf (stderr, "%p,", pr);
+        }
+    }
+
+    fprintf (stderr, "\n");
+}
+
+
+#endif

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

@@ -0,0 +1,171 @@
+#ifndef NDK_DEBUG_H
+#define NDK_DEBUG_H
+
+
+/* TODO : use the Nginx printf function */
+
+
+#include <ngx_core.h>
+#include <ngx_http.h>
+
+/* TODO
+- andk_debug variety of debugging formats
+- global include file for all debugging - can pass declaration to cflags for the option
+*/
+
+
+#if (NDK_DEBUG)
+
+    #if (NGX_HAVE_VARIADIC_MACROS)
+
+        #define ndk_debug(...)  ndk_debug_helper (__func__,__VA_ARGS__)
+
+        #define ndk_debug_helper(func,...) \
+            fprintf(stderr, "%-60s", func); \
+            fprintf(stderr, (const char *)__VA_ARGS__); \
+            fprintf(stderr,"\n");
+            /*fprintf(stderr, " at %s line %d.\n", __FILE__, __LINE__)*/
+
+    #else
+
+        /* NOTE : these includes might not be necessary since they're probably included with the core */
+
+        #include <stdarg.h>
+        #include <stdio.h>
+        #include <stdarg.h>
+
+        static void ndk_debug (const char * fmt, ...) {
+        }
+
+    #endif
+
+    #if NDK_DEBUG > 1
+
+        #define ndk_debug_request()  ndk_debug_request_helper(r, __func__)
+
+        static ngx_inline void
+        ndk_debug_request_helper (ngx_http_request_t *r, const char *func)
+        {
+            ngx_http_posted_request_t       *pr;
+
+            /* TODO : improve the format */
+
+            fprintf (stderr, "%s %.*s %.*s?%.*s c:%d m:%p r:%p ar:%p pr:%p",
+                    func,
+                    (int) r->method_name.len, r->method_name.data,
+                    (int) r->uri.len, r->uri.data,
+                    (int) r->args.len, r->args.data,
+                    0/*(int) r->main->count*/, r->main,
+                    r, r->connection->data, r->parent);
+
+            if (r->posted_requests) {
+                fprintf(stderr, " posted:");
+
+                for (pr = r->posted_requests; pr; pr = pr->next) {
+                    fprintf (stderr, "%p,", pr);
+                }
+            }
+
+            fprintf (stderr, "\n");
+        }
+
+
+    #else
+
+        #define ndk_debug_request()
+
+    #endif
+
+
+    static ngx_inline void
+    ndk_debug_print_posted_requests (ngx_http_request_t *r)
+    {
+        ngx_http_posted_request_t   *pr;
+
+        ndk_request_log_debug_http (r, "ndk debug - http posted requests");
+
+        for (pr = r->main->posted_requests; pr; pr = pr->next) {
+
+            if (!pr->request)
+                continue;
+
+            ndk_request_log_debug_http (r, "ndk debug - http posted request:%V", &pr->request->uri);
+        }
+    }
+
+
+    #define ndk_debug_http_conf_location(cf)    ndk_debug_http_conf_location_helper (cf, __func__)
+
+    static ngx_inline void
+    ndk_debug_http_conf_location_helper (ngx_conf_t *cf, const char *func)
+    {
+        ngx_http_core_loc_conf_t        *lcf;
+
+        lcf = ngx_http_conf_get_module_loc_conf (cf, ngx_http_core_module);
+
+        ndk_debug_helper (func, "[%s]", lcf->name.data);
+    }
+
+    /*
+    static void
+    ndk_debug_log_chain (ngx_log_t *log, ngx_chain_t *cl)
+    {
+
+
+    }
+    */
+
+#else
+
+    #if (NGX_HAVE_VARIADIC_MACROS)
+
+        #define     ndk_debug(...)
+        #define     ndk_debug_request()
+
+    #else
+
+        #include <stdarg.h>
+
+        static void ndk_debug (const char * fmt, ...) {
+        }
+
+        static void ndk_debug_request() {
+        }
+
+    #endif
+
+    #define     ndk_debug_http_conf_location(cf)
+
+#endif
+
+#if (NDK_DEBUG)
+
+    #define     ndk_debug_check_read_event_handler(r)                               \
+                                                                                    \
+                    ndk_debug("r->read_event_handler = %s",                         \
+                        r->read_event_handler == ngx_http_block_reading ?           \
+                            "ngx_http_block_reading" :                              \
+                        r->read_event_handler == ngx_http_test_reading ?            \
+                            "ngx_http_test_reading" :                               \
+                        r->read_event_handler == ngx_http_request_empty_handler ?   \
+                            "ngx_http_request_empty_handler" : "UNKNOWN")
+
+    #define     ndk_debug_check_write_event_handler(r)                              \
+                                                                                    \
+                    ndk_debug ("r->write_event_handler = %s",                       \
+                        r->write_event_handler == ngx_http_handler ?                \
+                            "ngx_http_handler" :                                    \
+                        r->write_event_handler == ngx_http_core_run_phases ?        \
+                            "ngx_http_core_run_phases" :                            \
+                        r->write_event_handler == ngx_http_request_empty_handler ?  \
+                            "ngx_http_request_empty_handler" : "UNKNOWN")
+
+#else
+
+    #define     ndk_debug_check_read_event_handler(r)
+    #define     ndk_debug_check_write_event_handler(r)
+
+#endif
+
+#endif /* NDK_DEBUG_H */
+

data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/src/ndk_encoding.c

@@ -0,0 +1,57 @@
+
+
+
+char *
+ndk_conf_set_encoding_slot (ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    char    *p = conf;
+
+    ndk_encoding_t  *ep;
+    ngx_str_t       *value;
+    size_t           len;
+    iconv_t          ic;
+
+    ep = (ndk_encoding_t *) (p + cmd->offset);
+    if (ep->from && ep->to)
+        return  "is duplicate";
+
+    value = cf->args->elts;
+
+
+    if (ep->from) {
+
+        ep->to = (char *) value[1].data;
+        len = strlen (ep->from);
+
+    } else if (ep->to) {
+
+        ep->from = (char *) value[1].data;
+        len = strlen (ep->to);
+
+    } else {
+        return  "has no base encoding";
+    }
+
+
+    if (len == value[1].len && !strncasecmp (ep->to, ep->from, len)) {
+
+        ngx_log_error (NGX_LOG_WARN, cf->log, 0, 
+            "\"%V\" '%V' encoding is ignored (no conversion)", &value[0], &value[1]);
+
+        return  NGX_CONF_OK;
+    }
+
+
+    ic = iconv_open (ep->to, ep->from);
+    if (ic == (iconv_t)-1)
+        return  "has an invalid encoding";
+
+
+    if (iconv_close (ic)) {
+        ngx_log_error (NGX_LOG_EMERG, cf->log, errno, "iconv_close()");
+        return  NGX_CONF_ERROR;
+    }
+
+    return  NGX_CONF_OK;
+}
+

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

@@ -0,0 +1,12 @@
+
+
+#include    <iconv.h>
+
+typedef struct {
+    char        *from;
+    char        *to;
+} ndk_encoding_t;
+
+
+char *  ndk_conf_set_encoding_slot  (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+

data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/src/ndk_hash.c

@@ -0,0 +1,82 @@
+
+#include <ndk_hash.h>
+
+
+
+/* openssl hashes */
+
+#define     NDK_OPENSSL_HASH(type,ctxt_type,upper)                  \
+    u_char              md [ctxt_type ## _DIGEST_LENGTH];           \
+    ctxt_type ##_CTX    c;                                          \
+                                                                    \
+    type ## _Init (&c);                                             \
+    type ## _Update (&c, data, len);                                \
+    type ## _Final (md, &c);                                        \
+                                                                    \
+    ndk_hex_dump (p, (u_char *) md, ctxt_type ## _DIGEST_LENGTH);   \
+    if (upper) {                                                    \
+        ndk_strtoupper (p, (ctxt_type ## _DIGEST_LENGTH) *2);       \
+    }
+
+
+#ifdef NDK_MD5
+
+void
+ndk_md5_hash (u_char *p, char *data, size_t len)
+{
+    NDK_OPENSSL_HASH (MD5, MD5, 0);
+}
+
+void
+ndk_md5_hash_upper (u_char *p, char *data, size_t len)
+{
+    NDK_OPENSSL_HASH (MD5, MD5, 1);
+}
+
+#endif
+#ifdef NDK_SHA1
+
+void
+ndk_sha1_hash (u_char *p, char *data, size_t len)
+{
+    NDK_OPENSSL_HASH (SHA1, SHA, 0);
+}
+
+void
+ndk_sha1_hash_upper (u_char *p, char *data, size_t len)
+{
+    NDK_OPENSSL_HASH (SHA1, SHA, 1);
+}
+
+#endif
+
+
+
+/* non-openssl hashes */
+
+#ifdef NDK_MURMUR2
+
+#include    "hash/murmurhash2.c"
+
+void
+ndk_murmur2_hash (u_char *p, char *data, size_t len)
+{
+    uint32_t    hash;
+
+    hash = MurmurHash2 (data, len, 47);
+
+    ndk_hex_dump (p, (u_char*) &hash, 4);
+}
+
+void
+ndk_murmur2_hash_upper (u_char *p, char *data, size_t len)
+{
+    uint32_t    hash;
+
+    hash = MurmurHash2 (data, len, 47);
+
+    ndk_hex_dump (p, (u_char*) &hash, 4);
+    ndk_strtoupper (p, 8);
+}
+
+#endif

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

@@ -0,0 +1,45 @@
+
+#ifndef NDK_HASH_H
+#define NDK_HASH_H
+
+#ifdef NDK_HASH_ALL
+
+#ifndef NDK_MD5
+#define NDK_MD5
+#endif
+
+#ifndef NDK_MURMUR2
+#define NDK_MURMUR2
+#endif
+
+#ifndef NDK_SHA1
+#define NDK_SHA1
+#endif
+
+#endif
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+typedef void (*ndk_hash_pt) (u_char *p, char *data, size_t len);
+
+
+#ifdef NDK_MD5
+#include <ngx_md5.h>
+void    ndk_md5_hash            (u_char *p, char *data, size_t len);
+void    ndk_md5_hash_upper      (u_char *p, char *data, size_t len);
+#endif
+
+#ifdef NDK_MURMUR2
+#define MURMURHASH2_DIGEST_LENGTH   4
+void    ndk_murmur2_hash        (u_char *p, char *data, size_t len);
+void    ndk_murmur2_hash_upper  (u_char *p, char *data, size_t len);
+#endif
+
+#ifdef NDK_SHA1
+#include <ngx_sha1.h>
+void    ndk_sha1_hash           (u_char *p, char *data, size_t len);
+void    ndk_sha1_hash_upper     (u_char *p, char *data, size_t len);
+#endif
+
+#endif /* NDK_HASH_H */
+