diff options
| author | Jim Jagielski <jim@apache.org> | 2017-05-02 11:01:17 +0000 |
|---|---|---|
| committer | Jim Jagielski <jim@apache.org> | 2017-05-02 11:01:17 +0000 |
| commit | 816fb149310fcdd969cea58fde80d40fac898a07 (patch) | |
| tree | 1e4a6afdf3feb12711e4fdf7972949629f61a8c3 /server | |
| parent | beed75c4efa3b8cbe7dcc583d4f6b50f5f78310d (diff) | |
| download | httpd-816fb149310fcdd969cea58fde80d40fac898a07.tar.gz | |
Merge r1788032, r1788033, r1783764, r1707512, r1783770 from trunk:
Save a few bytes in the conf pool.
'push_item' and 'add_alt' already duplicate their parameters, so we can safely use the temp_pool here.
Use 'ap_cstr_casecmp' to simplify code.
Remove useless case. We know that to can not be NULL at this point.
Follow up to r1772812: update APLOGNO().
* modules/ssl/ssl_engine_kernel.c: Constify the ssl_hook_Fixup_vars array itself.
winnt/service: each log message should use its own APLOGNO.
Submitted by: jailletc36, ylavic, jorton, ylavic
Reviewed by: jailletc36, covener, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1793466 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server')
| -rw-r--r-- | server/mpm/winnt/service.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/server/mpm/winnt/service.c b/server/mpm/winnt/service.c index 22f044dd2f..121aca1fa8 100644 --- a/server/mpm/winnt/service.c +++ b/server/mpm/winnt/service.c @@ -467,7 +467,7 @@ static void __stdcall service_nt_main_fn(DWORD argc, LPSTR *argv) { ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_STARTUP, apr_get_os_error(), NULL, - APLOGNO(00365) "Failure registering service handler"); + APLOGNO(10008) "Failure registering service handler"); return; } @@ -956,7 +956,7 @@ apr_status_t mpm_service_uninstall(void) if (!schSCManager) { rv = apr_get_os_error(); ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_STARTUP, rv, NULL, - APLOGNO(00369) "Failed to open the Windows service " + APLOGNO(10009) "Failed to open the Windows service " "manager, perhaps you forgot to log in as Adminstrator?"); return (rv); } @@ -976,7 +976,7 @@ apr_status_t mpm_service_uninstall(void) if (!schService) { rv = apr_get_os_error(); ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_STARTUP, rv, NULL, - APLOGNO(00373) "Failed to open the '%s' service", + APLOGNO(10010) "Failed to open the '%s' service", mpm_display_name); return (rv); } @@ -1046,7 +1046,7 @@ apr_status_t mpm_service_start(apr_pool_t *ptemp, int argc, if (!schSCManager) { rv = apr_get_os_error(); ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_STARTUP, rv, NULL, - APLOGNO(00369) "Failed to open the Windows service " + APLOGNO(10011) "Failed to open the Windows service " "manager, perhaps you forgot to log in as Adminstrator?"); return (rv); } @@ -1068,7 +1068,7 @@ apr_status_t mpm_service_start(apr_pool_t *ptemp, int argc, if (!schService) { rv = apr_get_os_error(); ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_STARTUP, rv, NULL, - APLOGNO(00373) "Failed to open the '%s' service", + APLOGNO(10012) "Failed to open the '%s' service", mpm_display_name); CloseServiceHandle(schSCManager); return (rv); @@ -1156,7 +1156,7 @@ void mpm_signal_service(apr_pool_t *ptemp, int signal) if (!schSCManager) { ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_STARTUP, apr_get_os_error(), NULL, - APLOGNO(00369) "Failed to open the Windows service " + APLOGNO(10013) "Failed to open the Windows service " "manager, perhaps you forgot to log in as Adminstrator?"); return; } @@ -1183,7 +1183,7 @@ void mpm_signal_service(apr_pool_t *ptemp, int signal) /* Could not open the service */ ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_STARTUP, apr_get_os_error(), NULL, - APLOGNO(00373) "Failed to open the '%s' service", + APLOGNO(10014) "Failed to open the '%s' service", mpm_display_name); CloseServiceHandle(schSCManager); return; |