source: branches/locker-dev/server/fedora/specs/httpd.spec.patch

Last change on this file was 1035, checked in by mitchb, 15 years ago
Fix "the-bug" (non-empty content in 304s) in PHP (patch by ezyang) and Apache PHP should not produce any output, even if zlib.output_compression is on, if the HTTP response code is 204 or 304 (no content or not modified). Fixes PHP bug #42362 with php.cvs #56693, see: Apache should discard any body provided by a script (in any language, not just PHP) when the status is "no content" or "not modified". Addresses part of Apache bug #40953, see: Solves support issue #773060, see:
File size: 2.0 KB
  • httpd.spec

    old new  
    66Summary: Apache HTTP Server
    77Name: httpd
    88Version: 2.2.10
    9 Release: 1%{?dist}
     9Release: 1%{?dist}.scripts.%{scriptsversion}
    1212Source1: index.html
    5454Conflicts: pcre < 4.0
    5555Requires: httpd-tools = %{version}-%{release}
     57Provides: scripts-httpd
     58Patch1000: httpd-suexec-scripts.patch
     59Patch1001: httpd-2.2.x-sni.patch
     60Patch1003: httpd-2.2.x-mod_status-security.patch
     61Patch1004: httpd-2.2.x-304.patch
    5864The Apache HTTP Server is a powerful, efficient, and extensible
    5965web server.
    100106BuildRequires: openssl-devel, distcache-devel
    101107Requires(post): openssl >= 0.9.7f-4, /bin/cat
    102108Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmn}
     109Provides: scripts-mod_ssl
    103110Obsoletes: stronghold-mod_ssl
    105112%description -n mod_ssl
    127134# Patch in vendor/release string
    128135sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
     137%patch1000 -p1 -b .scripts
     138%patch1001 -p1 -b .sni
     139%patch1003 -p1 -b .permitstatus
     140%patch1004 -p1 -b .scripts-304
    130142# Safety check: prevent build if defined MMN does not equal upstream MMN.
    131143vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
    132144if test "x${vmmn}" != "x%{mmn}"; then
    175187        --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
    176188        --enable-suexec --with-suexec \
    177189        --with-suexec-caller=%{suexec_caller} \
    178         --with-suexec-docroot=%{contentdir} \
     190        --with-suexec-docroot=/ \
     191        --with-suexec-userdir=web_scripts \
     192        --with-suexec-trusteddir=/usr/libexec/scripts-trusted \
    179193        --with-suexec-logfile=%{_localstatedir}/log/httpd/suexec.log \
    180194        --with-suexec-bin=%{_sbindir}/suexec \
    181         --with-suexec-uidmin=500 --with-suexec-gidmin=100 \
     195        --with-suexec-uidmin=50 --with-suexec-gidmin=50 \
    182196        --enable-pie \
    183197        --with-pcre \
    184198        $*
Note: See TracBrowser for help on using the repository browser.