Changeset 2321
- Timestamp:
- Sep 12, 2012, 9:08:54 PM (12 years ago)
- Location:
- trunk/server
- Files:
-
- 1 added
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/server/fedora/config/etc/httpd/conf/httpd.conf
r2270 r2321 319 319 SSLInsecureRenegotiation on 320 320 321 # Temporary fix for presumed CRIME attack against SSL 322 SSLCompression off 323 321 324 SSLPassPhraseDialog builtin 322 325 SSLSessionCache shmcb:/var/cache/mod_ssl/scache(512000) -
trunk/server/fedora/specs/httpd.spec.patch
r2246 r2321 10 10 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 11 11 Source1: index.html 12 @@ -58,6 +58,1 4@@12 @@ -58,6 +58,15 @@ 13 13 Requires(postun): systemd-units 14 14 Requires(post): systemd-units … … 21 21 +Patch1006: httpd-suexec-cloexec.patch 22 22 +Patch1007: httpd-fixup-vhost.patch 23 +Patch1008: httpd-SSLCompression.patch 23 24 + 24 25 %description 25 26 The Apache HTTP Server is a powerful, efficient, and extensible 26 27 web server. 27 @@ -68,6 +7 7,7 @@28 @@ -68,6 +78,7 @@ 28 29 Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel 29 30 Requires: apr-devel, apr-util-devel, pkgconfig … … 33 34 %description devel 34 35 The httpd-devel package contains the APXS binary and other files 35 @@ -106,6 +11 6,7 @@36 @@ -106,6 +117,7 @@ 36 37 Requires(post): openssl, /bin/cat 37 38 Requires(pre): httpd … … 41 42 42 43 %description -n mod_ssl 43 @@ -133,6 +1 49,13@@44 @@ -133,6 +150,14 @@ 44 45 # Patch in vendor/release string 45 46 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1 … … 51 52 +%patch1006 -p1 -b .cloexec 52 53 +%patch1007 -p1 -b .fixup-vhost 54 +%patch1008 -p1 -b .sslcompression 53 55 + 54 56 # Safety check: prevent build if defined MMN does not equal upstream MMN. 55 57 vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'` 56 58 if test "x${vmmn}" != "x%{mmn}"; then 57 @@ -193,10 +21 7,12 @@59 @@ -193,10 +219,12 @@ 58 60 --with-apr=%{_prefix} --with-apr-util=%{_prefix} \ 59 61 --enable-suexec --with-suexec \
Note: See TracChangeset
for help on using the changeset viewer.