← Back to branch summary

~ubuntu-branches/ubuntu/quantal/nginx/quantal-updates

« back to all changes in this revision

Viewing changes to debian/modules/nginx-lua/src/ngx_http_lua_module.c

  • Committer: Bazaar Package Importer
  • Author(s): Michael Lustfield, Micheal Lustfield, Kartik Mistry
  • Date: 2011-03-03 23:39:07 UTC
  • mfrom: (4.2.29 sid)
  • Revision ID: james.westby@ubuntu.com-20110303233907-y48yifhfnn5qjuxz
Tags: 0.8.54-4
http://bugs.debian.org/610946
https://launchpad.net/bugs/699736
http://bugs.debian.org/609343
http://bugs.debian.org/608983
http://bugs.debian.org/610289
http://bugs.debian.org/610290
http://bugs.debian.org/609797
http://bugs.debian.org/610983
http://bugs.debian.org/612832
http://bugs.debian.org/613175
http://bugs.debian.org/613355
http://bugs.debian.org/613851
http://bugs.debian.org/614987
http://bugs.debian.org/614980
[Micheal Lustfield]
* debian/nginx-{full,light,extras}.default:
  + Added comment about alternative to ULIMIT.
* debian/nginx-{full,light,extras}.init.d:
  + Added quotes around a test variable. (Closes: #610946, LP: #699736)
* debian/patches/609343-log-time-iso8601.diff:
  + Added patch to add $time_iso8601 variable to logs. (Closes: #609343)
* Clean up old logrotate files. (Closes: #608983, Closes: #610289)
  + Added Files:
    - debian/nginx-common.preinst
  + Modified Files:
    - debian/rules
  + Moved debian/nginx-common.logrotate to debian/logrotate.
* Added common files to nginx-common package. (Closes: #610290)
  + Removed Files:
    - debian/nginx-full.dirs
    - debian/nginx-light.dirs
    - debian/nginx-full.install
    - debian/nginx-light.install
    - debian/nginx-extras.install
    - debian/nginx.*
  + Added Files:
    - debian/nginx-common.default
    - debian/nginx-common.dirs
    - debian/nginx-common.init.d
    - debian/nginx-common.install
    - debian/nginx-common.manpages
    - debian/logrotate
  + Modified Files:
    - debian/nginx-extras.dirs
    - debian/control
    - debian/rules
* debian/nginx-*.install: (Closes: #609797)
  + Removed NEWS.Debian from nginx-{full,light,extras}.install.
  + Added NEWS.Debian to nginx-common.install.
* nginx-common.postinst:
  + Enforce /var/log/nginx mode and user:group. (Closes: #610983)
  + Enforce /var/log/nginx/*.log mode and user:group. (Closes: #612832)
* debian/rules:
  + Added --with-file-aio to nginx-extras. (Closes: #613175)
  + Removed split clients and user id modules from nginx-light.
* debian/conf/sites-available/default:
  + Fixed a minor typo ( s/Quickstart/QuickStart/ ). (Closes: #613355)
* debian/conf/mime.types:
  + Changed xml type to application/xhtml+xml. (Closes: #613851)
* debian/help/docs/fcgiwrap:
  + Removed Ubuntu specific line in docs. (Closes: #614987)
* debian/conf/sites-available/default:
  + Fixed a pointer to a file. (Closes: #614980)

[Kartik Mistry]
* debian/*.lintian-overrides:
  + Add Lintian overrides for nginx man page. We've manpage in nginx-common
    binary

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/modules/nginx-lua/src/ngx_http_lua_module.c
 
1
/* vim:set ft=c ts=4 sw=4 et fdm=marker: */
 
2
#include "ngx_http_lua_directive.h"
 
3
#include "ngx_http_lua_conf.h"
 
4
#include "ngx_http_lua_filter.h"
 
5
 
 
6
 
 
7
static ngx_command_t ngx_http_lua_cmds[] = {
 
8
    {
 
9
        ngx_string("lua_package_cpath"),
 
10
        NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
 
11
        ngx_http_lua_package_cpath,
 
12
        NGX_HTTP_MAIN_CONF_OFFSET,
 
13
        0,
 
14
        NULL
 
15
    },
 
16
 
 
17
    {
 
18
        ngx_string("lua_package_path"),
 
19
        NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
 
20
        ngx_http_lua_package_path,
 
21
        NGX_HTTP_MAIN_CONF_OFFSET,
 
22
        0,
 
23
        NULL
 
24
    },
 
25
 
 
26
    {
 
27
        ngx_string("lua_need_request_body"),
 
28
        NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF |
 
29
        NGX_CONF_FLAG,
 
30
        ngx_conf_set_flag_slot,
 
31
        NGX_HTTP_LOC_CONF_OFFSET,
 
32
        offsetof(ngx_http_lua_loc_conf_t, force_read_body),
 
33
        NULL
 
34
    },
 
35
 
 
36
    /* set_by_lua $res <inline script> [$arg1 [$arg2 [...]]] */
 
37
    {
 
38
        ngx_string("set_by_lua"),
 
39
        NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_SIF_CONF |
 
40
        NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_2MORE,
 
41
        ngx_http_lua_set_by_lua,
 
42
        NGX_HTTP_LOC_CONF_OFFSET,
 
43
        0,
 
44
        ngx_http_lua_filter_set_by_lua_inline
 
45
    },
 
46
 
 
47
    /* set_by_lua_file $res rel/or/abs/path/to/script [$arg1 [$arg2 [..]]] */
 
48
    {
 
49
        ngx_string("set_by_lua_file"),
 
50
        NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_SIF_CONF |
 
51
        NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_2MORE,
 
52
        ngx_http_lua_set_by_lua,
 
53
        NGX_HTTP_LOC_CONF_OFFSET,
 
54
        0,
 
55
        ngx_http_lua_filter_set_by_lua_file
 
56
    },
 
57
 
 
58
    /* content_by_lua <inline script> */
 
59
    {
 
60
        ngx_string("content_by_lua"),
 
61
        NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
 
62
        ngx_http_lua_content_by_lua,
 
63
        NGX_HTTP_LOC_CONF_OFFSET,
 
64
        0,
 
65
        ngx_http_lua_content_handler_inline
 
66
    },
 
67
 
 
68
    /* content_by_lua_file rel/or/abs/path/to/script */
 
69
    {
 
70
        ngx_string("content_by_lua_file"),
 
71
        NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
 
72
        ngx_http_lua_content_by_lua,
 
73
        NGX_HTTP_LOC_CONF_OFFSET,
 
74
        0,
 
75
        ngx_http_lua_content_handler_file
 
76
    },
 
77
 
 
78
    ngx_null_command
 
79
};
 
80
 
 
81
ngx_http_module_t ngx_http_lua_module_ctx = {
 
82
    NULL,                             /*  preconfiguration */
 
83
    ngx_http_lua_filter_init,         /*  postconfiguration */
 
84
 
 
85
    ngx_http_lua_create_main_conf,    /*  create main configuration */
 
86
    ngx_http_lua_init_main_conf,      /*  init main configuration */
 
87
 
 
88
    NULL,                             /*  create server configuration */
 
89
    NULL,                             /*  merge server configuration */
 
90
 
 
91
    ngx_http_lua_create_loc_conf,     /*  create location configuration */
 
92
    ngx_http_lua_merge_loc_conf       /*  merge location configuration */
 
93
};
 
94
 
 
95
ngx_module_t ngx_http_lua_module = {
 
96
    NGX_MODULE_V1,
 
97
    &ngx_http_lua_module_ctx,   /*  module context */
 
98
    ngx_http_lua_cmds,          /*  module directives */
 
99
    NGX_HTTP_MODULE,            /*  module type */
 
100
    NULL,                       /*  init master */
 
101
    NULL,                       /*  init module */
 
102
    NULL,                       /*  init process */
 
103
    NULL,                       /*  init thread */
 
104
    NULL,                       /*  exit thread */
 
105
    NULL,                       /*  exit process */
 
106
    NULL,                       /*  exit master */
 
107
    NGX_MODULE_V1_PADDING
 
108
};
 
109