httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bnicho...@apache.org
Subject cvs commit: httpd-2.0/server main.c
Date Wed, 29 Jan 2003 17:06:50 GMT
bnicholes    2003/01/29 09:06:50

  Modified:    server/mpm/netware mpm_netware.c
               server   main.c
  Log:
  Enabled the -n parameter on NetWare to allow the administrator to rename
  the console screen
  
  Revision  Changes    Path
  1.65      +7 -1      httpd-2.0/server/mpm/netware/mpm_netware.c
  
  Index: mpm_netware.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/netware/mpm_netware.c,v
  retrieving revision 1.64
  retrieving revision 1.65
  diff -u -r1.64 -r1.65
  --- mpm_netware.c	12 Dec 2002 19:40:52 -0000	1.64
  +++ mpm_netware.c	29 Jan 2003 17:06:49 -0000	1.65
  @@ -124,6 +124,7 @@
   #include <netware.h>
   #include <nks/netware.h>
   #include <library.h>
  +#include <screen.h>
   
   /* Limit on the total --- clients will be locked out if more servers than
    * this are needed.  It is intended solely to keep the server from crashing
  @@ -1058,8 +1059,13 @@
               optbuf[0] = '-';
               optbuf[2] = '\0';
               apr_getopt_init(&opt, process->pool, process->argc, (char**) process->argv);
  -            while (apr_getopt(opt, AP_SERVER_BASEARGS, optbuf + 1, &opt_arg) == APR_SUCCESS)
{
  +            while (apr_getopt(opt, AP_SERVER_BASEARGS"n:", optbuf + 1, &opt_arg) ==
APR_SUCCESS) {
                   switch (optbuf[1]) {
  +                case 'n':
  +                    if (opt_arg) {
  +                        renamescreen(opt_arg);
  +                    }
  +                    break;
   				case 'E':
   					/* Don't need to hold the screen open if the output is going to a file */
   					hold_screen_on_exit = -1;
  
  
  
  1.141     +4 -0      httpd-2.0/server/main.c
  
  Index: main.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/main.c,v
  retrieving revision 1.140
  retrieving revision 1.141
  diff -u -r1.140 -r1.141
  --- main.c	16 Oct 2002 18:03:44 -0000	1.140
  +++ main.c	29 Jan 2003 17:06:50 -0000	1.141
  @@ -342,6 +342,10 @@
                    "  -c \"directive\"    : process directive after reading "
                    "config files");
   
  +#ifdef NETWARE
  +    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
  +                 "  -n name           : set screen name");
  +#endif
   #ifdef WIN32
       ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
                    "  -n name           : set service name and use its "
  
  
  

Mime
View raw message