rpms/httpd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

tweak default ssl.conf

Browse Source 
- fix restart handling (#814645)
- use graceful restart by default
Resolves: rhbz#814645
This commit is contained in:
Joe Orton 2012-04-20 12:38:40 +01:00
parent b72df69f2e
commit ea6aac8abd
4 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
httpd-2.4.2-restart.patch Normal file
View File

@ -0,0 +1,29 @@
https://bugzilla.redhat.com/show_bug.cgi?id=814645
--- httpd-2.4.2/server/main.c.restart
+++ httpd-2.4.2/server/main.c
@@ -671,6 +671,11 @@ int main(int argc, const char * const ar
}
}
+ /* If our config failed, deal with that here. */
+ if (rv != OK) {
+ destroy_and_exit_process(process, 1);
+ }
+
signal_server = APR_RETRIEVE_OPTIONAL_FN(ap_signal_server);
if (signal_server) {
int exit_status;
@@ -680,11 +685,6 @@ int main(int argc, const char * const ar
}
}
- /* If our config failed, deal with that here. */
- if (rv != OK) {
- destroy_and_exit_process(process, 1);
- }
-
apr_pool_clear(plog);
if ( ap_run_open_logs(pconf, plog, ptemp, ap_server_conf) != OK) {

3
httpd.service
View File

@ -7,8 +7,7 @@ Type=forking
PIDFile=/var/run/httpd/httpd.pid PIDFile=/var/run/httpd/httpd.pid
EnvironmentFile=/etc/sysconfig/httpd EnvironmentFile=/etc/sysconfig/httpd
ExecStart=/usr/sbin/httpd $OPTIONS ExecStart=/usr/sbin/httpd $OPTIONS
ExecReload=/usr/sbin/httpd $OPTIONS -t ExecReload=/usr/sbin/httpd $OPTIONS -k graceful
ExecReload=/usr/sbin/httpd -HUP $MAINPID
ExecStop=/usr/sbin/httpd $OPTIONS -k graceful-stop ExecStop=/usr/sbin/httpd $OPTIONS -k graceful-stop
PrivateTmp=true PrivateTmp=true

7
httpd.spec
View File

@ -8,7 +8,7 @@
Summary: Apache HTTP Server Summary: Apache HTTP Server
Name: httpd Name: httpd
Version: 2.4.2 Version: 2.4.2
Release: 1%{?dist} Release: 2%{?dist}
URL: http://httpd.apache.org/ URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
Source1: index.html Source1: index.html
@ -554,6 +554,11 @@ rm -rf $RPM_BUILD_ROOT
%{_sysconfdir}/rpm/macros.httpd %{_sysconfdir}/rpm/macros.httpd
%changelog %changelog
* Fri Apr 20 2012 Joe Orton <jorton@redhat.com> - 2.4.2-2
- tweak default ssl.conf
- fix restart handling (#814645)
- use graceful restart by default
* Wed Apr 18 2012 Jan Kaluza <jkaluza@redhat.com> - 2.4.2-1 * Wed Apr 18 2012 Jan Kaluza <jkaluza@redhat.com> - 2.4.2-1
- update to 2.4.2 - update to 2.4.2

3
ssl.conf
View File

@ -20,8 +20,7 @@ SSLPassPhraseDialog exec:/usr/libexec/httpd-ssl-pass-dialog
# Inter-Process Session Cache: # Inter-Process Session Cache:
# Configure the SSL Session Cache: First the mechanism # Configure the SSL Session Cache: First the mechanism
# to use and second the expiring timeout (in seconds). # to use and second the expiring timeout (in seconds).
#SSLSessionCache dc:UNIX:/var/cache/mod_ssl/distcache SSLSessionCache shmcb:/var/run/httpd/sslcache(512000)
SSLSessionCache shmcb:/var/cache/mod_ssl/scache(512000)
SSLSessionCacheTimeout 300 SSLSessionCacheTimeout 300
# Pseudo Random Number Generator (PRNG): # Pseudo Random Number Generator (PRNG):