httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@locus.apache.org
Subject cvs commit: apache-2.0/src/modules/mpm/winnt mpm_winnt.c
Date Mon, 23 Oct 2000 19:04:23 GMT
wrowe       00/10/23 12:04:23

  Modified:    src/modules/mpm/winnt mpm_winnt.c
  Log:
    Answer says... -X is redundant and inappropriate.
  
  Submitted by:	Bill Rowe
  Reviewed by:	Bill Stoddard
  
  Revision  Changes    Path
  1.107     +11 -9     apache-2.0/src/modules/mpm/winnt/mpm_winnt.c
  
  Index: mpm_winnt.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/winnt/mpm_winnt.c,v
  retrieving revision 1.106
  retrieving revision 1.107
  diff -u -r1.106 -r1.107
  --- mpm_winnt.c	2000/10/21 12:15:32	1.106
  +++ mpm_winnt.c	2000/10/23 19:04:23	1.107
  @@ -1915,9 +1915,6 @@
               /* TODO: warn of depreciated syntax, "use -k uninstall instead" */
               signal_arg = "uninstall";
               break;
  -        case 'X':
  -            one_process = -1;
  -            break;
           default:
               new_arg = (char**) apr_push_array(mpm_new_argv);
               *new_arg = apr_pstrdup(process->pool, optbuf);
  @@ -1978,16 +1975,21 @@
           {
               rv = mpm_merge_service_args(process->pool, mpm_new_argv, 
                                           fixed_args);
  -            if (rv != APR_SUCCESS) {
  -                ap_log_error(APLOG_MARK,APLOG_ERR, rv, NULL,
  -                             "%s: ConfigArgs are missing from the registry.",
  -                             display_name);
  +            if (rv == APR_SUCCESS) {
  +                ap_log_error(APLOG_MARK,APLOG_NOERRNO|APLOG_INFO, 0, NULL,
  +                             "Using ConfigArgs of the installed service "
  +                             "\"%s\".", display_name);
               }
  +			else  {
  +                ap_log_error(APLOG_MARK,APLOG_INFO, rv, NULL,
  +                             "No installed ConfigArgs for the service "
  +                             "\"%s\", using Apache defaults.", display_name);
  +			}
           }
           else
           {
  -            ap_log_error(APLOG_MARK,APLOG_ERR, 0, NULL,
  -                 "%s: No installed service by that name.", display_name);
  +            ap_log_error(APLOG_MARK,APLOG_INFO|APLOG_NOERRNO, 0, NULL,
  +                 "No installed service named \"%s\".", display_name);
               exit(1);
           }
       }
  
  
  

Mime
View raw message