Further Win9x code elimination and simplification

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@730874 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c
index 4d61a172154a748d0b2e7795602be9b717f6ca77..f9da06dcd3a863ec55bb3123aa423169c756a67f 100644 (file)
--- a/server/mpm/winnt/mpm_winnt.c
+++ b/server/mpm/winnt/mpm_winnt.c
@@ -989,6 +989,9 @@ void winnt_rewrite_args(process_rec *process)
     osver.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
     GetVersionEx(&osver);
 
+    /* We wish this was *always* a reservation, but sadly it wasn't so and
+     * we couldn't break a hard limit prior to NT Kernel 5.1
+     */
     if (osver.dwPlatformId == VER_PLATFORM_WIN32_NT 
         && ((osver.dwMajorVersion > 5)
          || ((osver.dwMajorVersion == 5) && (osver.dwMinorVersion > 0)))) {
@@ -1323,7 +1326,6 @@ static int winnt_pre_config(apr_pool_t *pconf_, apr_pool_t *plog, apr_pool_t *pt
         one_process = -1;
 
     if (!strcasecmp(signal_arg, "runservice")
-            && (osver.dwPlatformId == VER_PLATFORM_WIN32_NT)
             && (service_to_start_success != APR_SUCCESS)) {
         ap_log_error(APLOG_MARK,APLOG_CRIT, service_to_start_success, NULL,
                      "%s: Unable to start the service manager.",
@@ -1553,26 +1555,6 @@ static int winnt_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pt
             }
             CleanNullACL((void *)sa);
 
-            /* Now that we are flying at 15000 feet...
-             * wipe out the Win95 service console,
-             * signal the SCM the WinNT service started, or
-             * if not a service, setup console handlers instead.
-             */
-            if (!strcasecmp(signal_arg, "runservice"))
-            {
-                if (osver.dwPlatformId != VER_PLATFORM_WIN32_NT)
-                {
-                    rv = mpm_service_to_start(&service_name,
-                                              s->process->pool);
-                    if (rv != APR_SUCCESS) {
-                        ap_log_error(APLOG_MARK,APLOG_ERR, rv, ap_server_conf,
-                                     "%s: Unable to start the service manager.",
-                                     service_name);
-                        return HTTP_INTERNAL_SERVER_ERROR;
-                    }
-                }
-            }
-
             /* Create the start mutex, as an unnamed object for security.
              * Ths start mutex is used during a restart to prevent more than
              * one child process from entering the accept loop at once.

diff --git a/server/mpm/winnt/service.c b/server/mpm/winnt/service.c
index 02f0963d8edc71cb1d12672a59a23f39c6c4d3fc..93f38abbe71443c324d0da1301faf3c6f662ccb3 100644 (file)
--- a/server/mpm/winnt/service.c
+++ b/server/mpm/winnt/service.c
@@ -330,7 +330,7 @@ static void set_service_description(void)
             /* ###: utf-ize */
             ChangeServiceConfig2(schService,
                                  1 /* SERVICE_CONFIG_DESCRIPTION */,
-                                 (LPVOID) &full_description));
+                                 (LPVOID) &full_description);
             CloseServiceHandle(schService);
         }
         CloseServiceHandle(schSCManager);