← Back to branch summary

~ubuntu-branches/ubuntu/saucy/nginx/saucy-updates

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Kartik Mistry, Cyril Lavier, Michael Lustfield, Kartik Mistry
  • Date: 2012-05-14 11:15:00 UTC
  • mfrom: (4.2.49 sid)
  • Revision ID: package-import@ubuntu.com-20120514111500-1y9ij7zulu9xnmry
Tags: 1.2.0-1
http://bugs.debian.org/670306
http://bugs.debian.org/664878
http://bugs.debian.org/664271
http://bugs.debian.org/673580
http://bugs.debian.org/672632
[Cyril Lavier]
* New upstream release. (Closes: #670306)
  + 1.2.x is stable release now.
* debian/modules/chunkin-nginx-module:
  + Updated chunkin-nginx-module to v0.23rc2-3-g85eca98.
* debian/modules/headers-more-module:
  + Updated headers-more-module to v0.17rc1-4-g33a82ed.
* debian/modules/nginx-development-kit:
  + Updated nginx-development-kit to v0.2.17-7-g24202b4.
* debian/modules/nginx-echo:
  + Updated nginx-echo to v0.38rc2-7-g080c0a1.
* debian/modules/nginx-lua:
  + Updated nginx-lua to v0.5.0rc25-5-g8d28785.
* debian/modules/nginx-upstream-fair:
  + Updated nginx-upstream-fair to a18b409.
* debian/modules/nginx-upload-progress:
  + Updated nginx-upload-progress to v0.9.0-0-ga788dea.
* debian/modules/naxsi:
  + Updated naxsi to 0.46
* debian/modules/README.Modules-versions:
  + Updated versions and URLs for modules.
* debian/naxsi-ui-extract, debian/naxsi-ui-intercept,
  debian/nginx-naxsi-ui.*, debian/naxsi-ui-extract.1,
  debian/naxsi-ui-intercept.1, debian/rules:
  + Added nginx-naxsi-ui package containing the learning daemon
    and the WebUI.
* debian/nginx-common.nginx.default, debian/nginx-common.nginx.init:
  + Renamed files to be compliant with the nginx-naxsi-ui package.
* debian/po:
  + Added needed files for using po-debconf.
  + Added French translation.
* debian/control:
  + Applied the modifications given after the review by Justin Rye.

[Michael Lustfield]
* debian/conf/uwsgi_params:
  + Added UWSGI_SCHEME to uwsgi_params. (Closes: #664878)
* debian/conf/sites-available/default:
  + Added allow directive for ipv6 localhost. (Closes: #664271)

[Kartik Mistry]
* debian/control:
  + wrap-and-sort.
* debian/copyright:
  + Added missing copyrights, minor formatting fixes.
* debian/nginx-common.nginx.init:
  + Added ulimit for restarts, Thanks to Daniel Roschka
    <danielroschka@phoenitydawn.de> for patch. (Closes: #673580)
* debian/conf/sites-available/default:
  + Added patch to fix deprecated "listen" directive, Thanks to
    Guillaume Plessis <gui@dotdeb.org> for patch. (Closes: #672632)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/modules/nginx-lua/src/ngx_http_lua_conf.c
1
1
/* vim:set ft=c ts=4 sw=4 et fdm=marker: */
2
2
 
 
3
#ifndef DDEBUG
 
4
#define DDEBUG 0
 
5
#endif
 
6
#include "ddebug.h"
 
7
 
3
8
#include <nginx.h>
4
9
#include "ngx_http_lua_conf.h"
5
10
#include "ngx_http_lua_util.h"
48
53
 
49
54
    if (lmcf->lua == NULL) {
50
55
        if (ngx_http_lua_init_vm(cf, lmcf) != NGX_CONF_OK) {
51
 
            ngx_conf_log_error(NGX_ERROR, cf, 0, "Failed to initialize Lua VM");
 
56
            ngx_conf_log_error(NGX_LOG_ERR, cf, 0,
 
57
                               "Failed to initialize Lua VM");
52
58
            return NGX_CONF_ERROR;
53
59
        }
54
60
 
87
93
 
88
94
    conf->force_read_body   = NGX_CONF_UNSET;
89
95
    conf->enable_code_cache = NGX_CONF_UNSET;
90
 
    conf->tag = (ngx_buf_tag_t) &ngx_http_lua_module;
 
96
    conf->http10_buffering  = NGX_CONF_UNSET;
 
97
 
 
98
    conf->keepalive_timeout = NGX_CONF_UNSET_MSEC;
 
99
    conf->connect_timeout = NGX_CONF_UNSET_MSEC;
 
100
    conf->send_timeout = NGX_CONF_UNSET_MSEC;
 
101
    conf->read_timeout = NGX_CONF_UNSET_MSEC;
 
102
    conf->send_lowat = NGX_CONF_UNSET_SIZE;
 
103
    conf->buffer_size = NGX_CONF_UNSET_SIZE;
 
104
    conf->pool_size = NGX_CONF_UNSET_UINT;
91
105
 
92
106
    return conf;
93
107
}
125
139
 
126
140
    ngx_conf_merge_value(conf->force_read_body, prev->force_read_body, 0);
127
141
    ngx_conf_merge_value(conf->enable_code_cache, prev->enable_code_cache, 1);
 
142
    ngx_conf_merge_value(conf->http10_buffering, prev->http10_buffering, 1);
 
143
 
 
144
    ngx_conf_merge_msec_value(conf->keepalive_timeout,
 
145
                              prev->keepalive_timeout, 60000);
 
146
 
 
147
    ngx_conf_merge_msec_value(conf->connect_timeout,
 
148
                              prev->connect_timeout, 60000);
 
149
 
 
150
    ngx_conf_merge_msec_value(conf->send_timeout,
 
151
                              prev->send_timeout, 60000);
 
152
 
 
153
    ngx_conf_merge_msec_value(conf->read_timeout,
 
154
                              prev->read_timeout, 60000);
 
155
 
 
156
    ngx_conf_merge_size_value(conf->send_lowat,
 
157
                              prev->send_lowat, 0);
 
158
 
 
159
    ngx_conf_merge_size_value(conf->buffer_size,
 
160
                              prev->buffer_size,
 
161
                              (size_t) ngx_pagesize);
 
162
 
 
163
    ngx_conf_merge_uint_value(conf->pool_size, prev->pool_size, 30);
128
164
 
129
165
    return NGX_CONF_OK;
130
166
}