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

- add improved child reclaim timing logic (#119128/#132360)

Browse Source 
- add BuildRequire zlib-devel for mod_deflate
This commit is contained in:
jorton 2004-09-14 13:41:57 +00:00
parent 5ada48b91e
commit 805286c60f
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
httpd.spec
View File

@ -1,13 +1,13 @@
%define contentdir /var/www %define contentdir /var/www
%define suexec_caller apache %define suexec_caller apache
%define mmn 20020903 %define mmn 20020903
%define vstring Red Hat %define vstring Fedora
%define distro Red Hat Enterprise Linux %define distro Fedora Core
Summary: Apache HTTP Server Summary: Apache HTTP Server
Name: httpd Name: httpd
Version: 2.0.50 Version: 2.0.50
Release: 7.ent Release: 8
URL: http://httpd.apache.org/ URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
Source1: index.html Source1: index.html
@ -53,6 +53,7 @@ Patch32: httpd-2.0.48-vhost.patch
Patch35: httpd-2.0.49-eocbucket.patch Patch35: httpd-2.0.49-eocbucket.patch
Patch37: httpd-2.0.46-autoindex.patch Patch37: httpd-2.0.46-autoindex.patch
Patch38: httpd-2.0.50-userdir.patch Patch38: httpd-2.0.50-userdir.patch
Patch39: httpd-2.0.50-reclaim.patch
# Features/functional changes # Features/functional changes
Patch70: httpd-2.0.48-release.patch Patch70: httpd-2.0.48-release.patch
Patch71: httpd-2.0.40-xfsz.patch Patch71: httpd-2.0.40-xfsz.patch
@ -78,7 +79,7 @@ License: Apache Software License
Group: System Environment/Daemons Group: System Environment/Daemons
BuildRoot: %{_tmppath}/%{name}-root BuildRoot: %{_tmppath}/%{name}-root
BuildRequires: db4-devel, expat-devel, findutils, perl, pkgconfig, xmlto >= 0.0.11 BuildRequires: db4-devel, expat-devel, findutils, perl, pkgconfig, xmlto >= 0.0.11
BuildRequires: apr-devel >= 0.9.4-20, apr-util-devel, pcre-devel BuildRequires: apr-devel >= 0.9.4-20, apr-util-devel, pcre-devel, zlib-devel
Requires: /etc/mime.types, gawk, /usr/share/magic.mime, /usr/bin/find Requires: /etc/mime.types, gawk, /usr/share/magic.mime, /usr/bin/find
Requires: httpd-suexec Requires: httpd-suexec
Prereq: /sbin/chkconfig, /bin/mktemp, /bin/rm, /bin/mv Prereq: /sbin/chkconfig, /bin/mktemp, /bin/rm, /bin/mv
@ -169,6 +170,7 @@ executed by SSI pages) as a user other than the 'apache' user.
%patch35 -p1 -b .eocbucket %patch35 -p1 -b .eocbucket
%patch37 -p1 -b .autoindex %patch37 -p1 -b .autoindex
%patch38 -p1 -b .userdir %patch38 -p1 -b .userdir
%patch39 -p1 -b .reclaim
%patch71 -p0 -b .xfsz %patch71 -p0 -b .xfsz
%patch72 -p1 -b .pod %patch72 -p1 -b .pod
@ -592,6 +594,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man8/suexec.8* %{_mandir}/man8/suexec.8*
%changelog %changelog
* Tue Sep 14 2004 Joe Orton <jorton@redhat.com> 2.0.50-8
- add improved child reclaim timing logic (#119128/#132360)
- add BuildRequire zlib-devel for mod_deflate
* Wed Sep 8 2004 Joe Orton <jorton@redhat.com> 2.0.50-7 * Wed Sep 8 2004 Joe Orton <jorton@redhat.com> 2.0.50-7
- prereq rather than just require httpd from -suexec (#132045) - prereq rather than just require httpd from -suexec (#132045)

12
index.html
View File

@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head> <head>
<title>Test Page for the Apache HTTP Server on Red Hat Enterprise Linux</title> <title>Test Page for the Apache HTTP Server on Fedora Core</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<style type="text/css"> <style type="text/css">
/*<![CDATA[*/ /*<![CDATA[*/
@ -27,7 +27,7 @@
text-align: center; text-align: center;
margin: 0; margin: 0;
padding: 0.6em 2em 0.4em; padding: 0.6em 2em 0.4em;
background-color: #900; background-color: #22437f;
color: #fff; color: #fff;
font-weight: normal; font-weight: normal;
font-size: 1.75em; font-size: 1.75em;
@ -85,7 +85,7 @@
</head> </head>
<body> <body>
<h1>Red Hat Enterprise Linux <strong>Test Page</strong></h1> <h1>Fedora Core <strong>Test Page</strong></h1>
<div class="content"> <div class="content">
<div class="content-middle"> <div class="content-middle">
@ -103,7 +103,7 @@
<p>For example, if you experienced problems while visiting www.example.com, you should send e-mail to "webmaster@example.com".</p> <p>For example, if you experienced problems while visiting www.example.com, you should send e-mail to "webmaster@example.com".</p>
<p>For information on Red Hat Enterprise Linux, please visit the <a href="http://www.redhat.com/">Red Hat, Inc. website</a>. The documentation for Red Hat Enterprise Linux is <a href="http://www.redhat.com/docs/manuals/enterprise/">available on the Red Hat, Inc. website</a>.</p> <p>For information on Fedora Core, please visit the <a href="http://fedora.redhat.com/">Fedora Project website</a>.</p>
<hr /> <hr />
</div> </div>
@ -113,9 +113,9 @@
<p>You may now add content to the directory <tt>/var/www/html/</tt>. Note that until you do so, people visiting your website will see this page, and not your content. To prevent this page from ever being used, follow the instructions in the file <tt>/etc/httpd/conf.d/welcome.conf</tt>.</p> <p>You may now add content to the directory <tt>/var/www/html/</tt>. Note that until you do so, people visiting your website will see this page, and not your content. To prevent this page from ever being used, follow the instructions in the file <tt>/etc/httpd/conf.d/welcome.conf</tt>.</p>
<div class="logos"> <div class="logos">
<p>You are free to use the images below on Apache and Red Hat powered HTTP servers. Thanks for using Apache and Red Hat Enterprise Linux!</p> <p>You are free to use the images below on Apache and Fedora Core powered HTTP servers. Thanks for using Apache and Fedora Core!</p>
<p><a href="http://httpd.apache.org/"><img src="/icons/apache_pb2.gif" alt="[ Powered by Apache ]"/></a> <a href="http://www.redhat.com/"><img src="/icons/powered_by_rh.png" alt="[ Powered by Red Hat ]" width="88" height="31" /></a></p> <p><a href="http://httpd.apache.org/"><img src="/icons/apache_pb2.gif" alt="[ Powered by Apache ]"/></a> <a href="http://fedora.redhat.com/"><img src="/icons/powered_by_fedora.png" alt="[ Powered by Fedora Core ]" width="88" height="31" /></a></p>
</div> </div>
</div> </div>
</div> </div>