← Back to branch summary

~britco/nginx/master

« back to all changes in this revision

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

  • Committer: Bazaar Package Importer
  • Author(s): Kartik Mistry, Kartik Mistry, Michael Lustfield
  • Date: 2010-11-27 21:04:02 UTC
  • mfrom: (1.3.8 upstream)
  • mto: This revision was merged to the branch mainline in revision 36.
  • Revision ID: james.westby@ubuntu.com-20101127210402-14sgjpe6r3jup8a9
Tags: 0.8.53-1
http://bugs.debian.org/592147
http://bugs.debian.org/593142
http://bugs.debian.org/593143
http://bugs.debian.org/594598
http://bugs.debian.org/602970
http://bugs.debian.org/581416
[Kartik Mistry]
* debian/control:
  + Added Michael Lustfield as co-maintainer
* nginx.conf:
  + No need to use regex in gzip_disable for msie6, Thanks to António P. P.
    Almeida <appa@perusio.net> (Closes: #592147)
* conf/sites-available/default:
  + Fixed typo for "include fastcgi", Thanks to Mostafa Ghadamyari
    <nginx@gigfa.com> (Closes: #593142, #593143)
* debian/patches/fix_reloading_ipv6.diff:
  + Removed, merged upstream
* debian/init.d:
  + Added fix to control nginx by user in a simple way by setting DAEMON
    variable to an invalid name in /etc/default/nginx. Patch by Toni Mueller
    <support@oeko.net> (Closes: #594598)
* debian/NEWS.Debian:
  + Updated news for 0.8.x as stable branch

[Michael Lustfield]
* New upstream release (Closes: #602970)
  + 0.8.x branch is declared stable by upstream now
* Add a UFW profile set:
  + debian/nginx.ufw.profile: Added.
  + debian/control: nginx: Suggests ufw.
  + debian/dirs: Add 'etc/ufw/applications.d'
  + debian/rules: Add install rule for the nginx UFW profile.
* Moved debian/dirs to debian/nginx.dirs
* Added types_hash_max_size to nginx.conf
* Install simple default index.html file (Closes: #581416)
  + debian/dirs: Add 'usr/share/nginx/www'.
  + debian/nginx.install: Add 'html/* usr/share/nginx/www'.
* debian/patches/nginx-echo.diff:
  + Added Echo module
* Added files for nginx.docs
  - /usr/share/doc/nginx/
    + debian/help/docs/fcgiwrap
    + debian/help/docs/php
    + debian/help/docs/support-irc
    + debian/help/docs/upstream
* Added files for nginx.examples
  - /usr/share/doc/nginx/examples/
    + debian/help/docs/drupal
    + debian/help/docs/http
    + debian/help/docs/mail
    + debian/help/docs/mailman
    + debian/help/docs/nginx.conf
    + debian/help/docs/virtual_hosts
    + debian/help/docs/wordpress
* debian/conf/:
  + Removed excess spaces
  + Added tabs where appropriate
  + Added SCRIPT_FILENAME to fastcgi_params

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/os/unix/ngx_process_cycle.c
685
685
        }
686
686
    }
687
687
 
 
688
    ngx_close_listening_sockets(cycle);
 
689
 
688
690
    /*
689
691
     * Copy ngx_cycle->log related data to the special static exit cycle,
690
692
     * log, and log file structures enough to allow a signal handler to log.
712
714
    ngx_uint_t         i;
713
715
    ngx_connection_t  *c;
714
716
 
 
717
    ngx_process = NGX_PROCESS_WORKER;
 
718
 
715
719
    ngx_worker_process_init(cycle, 1);
716
720
 
717
721
    ngx_setproctitle("worker process");
827
831
    ngx_core_conf_t  *ccf;
828
832
    ngx_listening_t  *ls;
829
833
 
830
 
    ngx_process = NGX_PROCESS_WORKER;
831
 
 
832
834
    if (ngx_set_environment(cycle, NULL) == NULL) {
833
835
        /* fatal */
834
836
        exit(2);
854
856
        }
855
857
    }
856
858
 
857
 
    if (ccf->rlimit_core != NGX_CONF_UNSET_SIZE) {
 
859
    if (ccf->rlimit_core != NGX_CONF_UNSET) {
858
860
        rlmt.rlim_cur = (rlim_t) ccf->rlimit_core;
859
861
        rlmt.rlim_max = (rlim_t) ccf->rlimit_core;
860
862
 
861
863
        if (setrlimit(RLIMIT_CORE, &rlmt) == -1) {
862
864
            ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
863
 
                          "setrlimit(RLIMIT_CORE, %i) failed",
 
865
                          "setrlimit(RLIMIT_CORE, %O) failed",
864
866
                          ccf->rlimit_core);
865
867
        }
866
868
    }
1026
1028
                && !c[i].read->resolver)
1027
1029
            {
1028
1030
                ngx_log_error(NGX_LOG_ALERT, cycle->log, 0,
1029
 
                              "open socket #%d left in connection %ui%s",
1030
 
                              c[i].fd, i, ngx_debug_quit ? ", aborting" : "");
1031
 
                ngx_debug_point();
 
1031
                              "open socket #%d left in connection %ui",
 
1032
                              c[i].fd, i);
 
1033
                ngx_debug_quit = 1;
1032
1034
            }
1033
1035
        }
1034
1036
 
1035
1037
        if (ngx_debug_quit) {
 
1038
            ngx_log_error(NGX_LOG_ALERT, cycle->log, 0, "aborting");
1036
1039
            ngx_debug_point();
1037
1040
        }
1038
1041
    }
1286
1289
 
1287
1290
    cycle->connection_n = 512;
1288
1291
 
 
1292
    ngx_process = NGX_PROCESS_HELPER;
 
1293
 
1289
1294
    ngx_worker_process_init(cycle, 0);
1290
1295
 
1291
1296
    ngx_close_listening_sockets(cycle);