← Back to branch summary

~ubuntu-branches/ubuntu/lucid/nginx/lucid

~ubuntu-branches/ubuntu/lucid/nginx/lucid

« back to all changes in this revision

Viewing changes to src/os/unix/ngx_process.c

Committer: Bazaar Package Importer
Author(s): Andres Rodriguez
Date: 2009-11-30 13:34:00 UTC
mfrom: (1.1.14 upstream) (4.2.10 squeeze)
Revision ID: james.westby@ubuntu.com-20091130133400-n0ux4igma2y3y0pl

Tags: 0.7.63-1ubuntu1

https://launchpad.net/bugs/490450

https://launchpad.net/bugs/308695

* Merge from debian testing (LP: #490450), remaining changes:
  - Install html files.
    - debian/dirs: Add 'var/www/nginx-default'.
    - debian/nginx.install: Add 'html/* var/www/nginx-default'.
  - Added a UFW profile set: (LP: #308695)
    + debian/nginx.ufw.profile: Added.
    + debian/control: nginx: Suggests ufw.
    + debian/dirs: Added 'etc/ufw/applications.d'
    + debian/rules: Added install rule for the nginx UFW profile.

files added:
auto/lib/geoip

auto/lib/geoip/conf

src/http/modules/ngx_http_geoip_module.c

files modified:
CHANGES

CHANGES.ru

auto/lib/conf

auto/modules

auto/options

auto/sources

debian/changelog

src/core/nginx.c

src/core/nginx.h

src/core/ngx_cycle.c

src/core/ngx_file.c

src/core/ngx_file.h

src/core/ngx_hash.c

src/core/ngx_output_chain.c

src/core/ngx_string.c

src/event/modules/ngx_devpoll_module.c

src/event/modules/ngx_epoll_module.c

src/event/modules/ngx_eventport_module.c

src/event/modules/ngx_kqueue_module.c

src/event/modules/ngx_rtsig_module.c

src/event/ngx_event.c

src/event/ngx_event_openssl.c

src/event/ngx_event_openssl.h

src/http/modules/ngx_http_access_module.c

src/http/modules/ngx_http_addition_filter_module.c

src/http/modules/ngx_http_auth_basic_module.c

src/http/modules/ngx_http_autoindex_module.c

src/http/modules/ngx_http_browser_module.c

src/http/modules/ngx_http_charset_filter_module.c

src/http/modules/ngx_http_dav_module.c

src/http/modules/ngx_http_fastcgi_module.c

src/http/modules/ngx_http_geo_module.c

src/http/modules/ngx_http_gzip_filter_module.c

src/http/modules/ngx_http_gzip_static_module.c

src/http/modules/ngx_http_headers_filter_module.c

src/http/modules/ngx_http_image_filter_module.c

src/http/modules/ngx_http_index_module.c

src/http/modules/ngx_http_limit_req_module.c

src/http/modules/ngx_http_limit_zone_module.c

src/http/modules/ngx_http_log_module.c

src/http/modules/ngx_http_map_module.c

src/http/modules/ngx_http_memcached_module.c

src/http/modules/ngx_http_proxy_module.c

src/http/modules/ngx_http_random_index_module.c

src/http/modules/ngx_http_realip_module.c

src/http/modules/ngx_http_referer_module.c

src/http/modules/ngx_http_rewrite_module.c

src/http/modules/ngx_http_secure_link_module.c

src/http/modules/ngx_http_ssi_filter_module.c

src/http/modules/ngx_http_ssl_module.c

src/http/modules/ngx_http_ssl_module.h

src/http/modules/ngx_http_sub_filter_module.c

src/http/modules/ngx_http_userid_filter_module.c

src/http/modules/ngx_http_xslt_filter_module.c

src/http/modules/perl/nginx.pm

src/http/modules/perl/ngx_http_perl_module.c

src/http/ngx_http_cache.h

src/http/ngx_http_core_module.c

src/http/ngx_http_core_module.h

src/http/ngx_http_file_cache.c

src/http/ngx_http_parse.c

src/http/ngx_http_request.c

src/http/ngx_http_request.h

src/http/ngx_http_script.c

src/http/ngx_http_upstream.c

src/http/ngx_http_upstream.h

src/http/ngx_http_write_filter_module.c

src/mail/ngx_mail_auth_http_module.c

src/mail/ngx_mail_core_module.c

src/mail/ngx_mail_proxy_module.c

src/mail/ngx_mail_ssl_module.c

src/os/unix/ngx_errno.h

src/os/unix/ngx_files.h

src/os/unix/ngx_process.c

src/os/unix/ngx_process.h

src/os/unix/ngx_process_cycle.c

src/os/unix/ngx_process_cycle.h

Show diffs side-by-side

added added

removed removed

src/os/unix/ngx_process.c

214

214

215

215

switch (respawn) {

216

216

217

case NGX_PROCESS_NORESPAWN:

218

ngx_processes[s].respawn = 0;

219

ngx_processes[s].just_spawn = 0;

220

ngx_processes[s].detached = 0;

221

break;

222

223

case NGX_PROCESS_JUST_SPAWN:

224

ngx_processes[s].respawn = 0;

225

ngx_processes[s].just_spawn = 1;

226

ngx_processes[s].detached = 0;

227

break;

228

217

229

case NGX_PROCESS_RESPAWN:

218

230

ngx_processes[s].respawn = 1;

219

ngx_processes[s].just_respawn = 0;

231

ngx_processes[s].just_spawn = 0;

220

232

ngx_processes[s].detached = 0;

221

233

break;

222

234

223

235

case NGX_PROCESS_JUST_RESPAWN:

224

236

ngx_processes[s].respawn = 1;

225

ngx_processes[s].just_respawn = 1;

237

ngx_processes[s].just_spawn = 1;

226

238

ngx_processes[s].detached = 0;

227

239

break;

228

240

229

241

case NGX_PROCESS_DETACHED:

230

242

ngx_processes[s].respawn = 0;

231

ngx_processes[s].just_respawn = 0;

243

ngx_processes[s].just_spawn = 0;

232

244

ngx_processes[s].detached = 1;

233

245

break;

234

246

}

Older »