← Back to branch summary

~ubuntu-branches/ubuntu/precise/nginx/precise

« back to all changes in this revision

Viewing changes to src/core/nginx.c

  • Committer: Package Import Robot
  • Author(s): Kartik Mistry, Kartik Mistry, Michael Lustfield
  • Date: 2011-11-18 23:44:00 UTC
  • mfrom: (4.2.39 sid)
  • Revision ID: package-import@ubuntu.com-20111118234400-atj8d0zog78vgdte
Tags: 1.1.8-1
http://bugs.debian.org/649061
https://launchpad.net/bugs/825349
https://launchpad.net/bugs/857831
https://launchpad.net/bugs/883440
http://bugs.debian.org/642995
https://launchpad.net/bugs/840358
[Kartik Mistry]
* New upstream release.
* debian/modules/chunkin-nginx-module:
  + Removed as of now, as it breaks with Perl 5.14 (Closes: #649061)

[Michael Lustfield]
* debian/control:
  + Added Map module to nginx-light modules list.
* debian/rules:
  + Removed --without-http_map_module form nginx-light.
* debian/nginx-common.install:
  + Changed ufw profile installation (LP: #825349).
    - debian/ufw.profile -> debian/ufw/nginx.
* debian/nginx-common.preinst:
  + Cleanup of moved nginx profile.
* debian/conf/nginx.conf:
  + Added a default map for $server_https (on|off).
* debian/conf/fastcgi_params:
  + Pass HTTPS so $_SERVER['HTTPS'] is set (LP: #857831).
* debian/conf/mime.types:
  + Added json type (LP: #883440).
* debian/conf/sites-available/default:
  + Added notes about PHP (Closes: #642995).
  + Changed location /doc from root to alias.
  + Changed location /doc to /doc/ for people that don't bother reading or
    learning anything about Nginx configuration files (LP: #840358).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/core/nginx.c
203
203
    ngx_cycle_t      *cycle, init_cycle;
204
204
    ngx_core_conf_t  *ccf;
205
205
 
 
206
    ngx_debug_init();
 
207
 
206
208
    if (ngx_strerror_init() != NGX_OK) {
207
209
        return 1;
208
210
    }
212
214
    }
213
215
 
214
216
    if (ngx_show_version) {
215
 
        ngx_log_stderr(0, "nginx version: " NGINX_VER);
 
217
        ngx_write_stderr("nginx version: " NGINX_VER NGX_LINEFEED);
216
218
 
217
219
        if (ngx_show_help) {
218
 
            ngx_log_stderr(0,
 
220
            ngx_write_stderr(
219
221
                "Usage: nginx [-?hvVtq] [-s signal] [-c filename] "
220
 
                             "[-p prefix] [-g directives]" CRLF CRLF
221
 
                "Options:" CRLF
222
 
                "  -?,-h         : this help" CRLF
223
 
                "  -v            : show version and exit" CRLF
 
222
                             "[-p prefix] [-g directives]" NGX_LINEFEED
 
223
                             NGX_LINEFEED
 
224
                "Options:" NGX_LINEFEED
 
225
                "  -?,-h         : this help" NGX_LINEFEED
 
226
                "  -v            : show version and exit" NGX_LINEFEED
224
227
                "  -V            : show version and configure options then exit"
225
 
                                   CRLF
226
 
                "  -t            : test configuration and exit" CRLF
 
228
                                   NGX_LINEFEED
 
229
                "  -t            : test configuration and exit" NGX_LINEFEED
227
230
                "  -q            : suppress non-error messages "
228
 
                                   "during configuration testing" CRLF
 
231
                                   "during configuration testing" NGX_LINEFEED
229
232
                "  -s signal     : send signal to a master process: "
230
 
                                   "stop, quit, reopen, reload" CRLF
 
233
                                   "stop, quit, reopen, reload" NGX_LINEFEED
231
234
#ifdef NGX_PREFIX
232
235
                "  -p prefix     : set prefix path (default: "
233
 
                                   NGX_PREFIX ")" CRLF
 
236
                                   NGX_PREFIX ")" NGX_LINEFEED
234
237
#else
235
 
                "  -p prefix     : set prefix path (default: NONE)" CRLF
 
238
                "  -p prefix     : set prefix path (default: NONE)" NGX_LINEFEED
236
239
#endif
237
240
                "  -c filename   : set configuration file (default: "
238
 
                                   NGX_CONF_PATH ")" CRLF
 
241
                                   NGX_CONF_PATH ")" NGX_LINEFEED
239
242
                "  -g directives : set global directives out of configuration "
240
 
                                   "file" CRLF
 
243
                                   "file" NGX_LINEFEED NGX_LINEFEED
241
244
                );
242
245
        }
243
246
 
244
247
        if (ngx_show_configure) {
 
248
            ngx_write_stderr(
245
249
#ifdef NGX_COMPILER
246
 
            ngx_log_stderr(0, "built by " NGX_COMPILER);
 
250
                "built by " NGX_COMPILER NGX_LINEFEED
247
251
#endif
248
252
#if (NGX_SSL)
249
253
#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
250
 
            ngx_log_stderr(0, "TLS SNI support enabled");
 
254
                "TLS SNI support enabled" NGX_LINEFEED
251
255
#else
252
 
            ngx_log_stderr(0, "TLS SNI support disabled");
253
 
#endif
254
 
#endif
255
 
            ngx_log_stderr(0, "configure arguments:" NGX_CONFIGURE);
 
256
                "TLS SNI support disabled" NGX_LINEFEED
 
257
#endif
 
258
#endif
 
259
                "configure arguments:" NGX_CONFIGURE NGX_LINEFEED);
256
260
        }
257
261
 
258
262
        if (!ngx_test_config) {
260
264
        }
261
265
    }
262
266
 
263
 
#if (NGX_FREEBSD)
264
 
    ngx_debug_init();
265
 
#endif
266
 
 
267
267
    /* TODO */ ngx_max_sockets = -1;
268
268
 
269
269
    ngx_time_init();