You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rb...@apache.org on 2001/02/05 02:02:27 UTC
cvs commit: httpd-2.0/include release.h httpd.h
rbb 01/02/04 17:02:27
Modified: . CHANGES
include httpd.h
Added: include release.h
Log:
Move the server version information out of httpd.h and into release.h.
This is in preparation of the first tag with the new tag and release
strategy.
Revision Changes Path
1.73 +5 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -b -w -u -r1.72 -r1.73
--- CHANGES 2001/02/02 21:32:27 1.72
+++ CHANGES 2001/02/05 01:02:26 1.73
@@ -1,4 +1,9 @@
Changes with Apache 2.0b1
+
+ *) Move the Apache version information out of httpd.h and into release.h.
+ This is in preparation for the first tag with the new tag and release
+ system. [Ryan Bloom]
+
*) Begin restructuring scoreboard code to enable adding back in
the ability to use IPC other than shared memory.
Get mod_status working on Windows again. [Bill Stoddard]
1.132 +1 -6 httpd-2.0/include/httpd.h
Index: httpd.h
===================================================================
RCS file: /home/cvs/httpd-2.0/include/httpd.h,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -d -b -w -u -r1.131 -r1.132
--- httpd.h 2001/01/20 06:05:14 1.131
+++ httpd.h 2001/02/05 01:02:27 1.132
@@ -79,6 +79,7 @@
#include "ap_config.h"
#include "ap_mmn.h"
+#include "release.h"
#include "os.h"
#include "apr_tables.h"
@@ -277,12 +278,6 @@
#define DEFAULT_INDEXING 0
#endif
#endif /* CORE_PRIVATE */
-
-#define AP_SERVER_BASEVENDOR "Apache Software Foundation"
-#define AP_SERVER_BASEPRODUCT "Apache"
-#define AP_SERVER_BASEREVISION "2.0b1-dev"
-#define AP_SERVER_BASEVERSION AP_SERVER_BASEPRODUCT "/" AP_SERVER_BASEREVISION
-#define AP_SERVER_VERSION AP_SERVER_BASEVERSION
#define AP_SERVER_PROTOCOL "HTTP/1.1"
1.1 httpd-2.0/include/release.h
Index: release.h
===================================================================
/* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2000 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Apache" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
* software without prior written permission. For written
* permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
* Portions of this software are based upon public domain software
* originally written at the National Center for Supercomputing Applications,
* University of Illinois, Urbana-Champaign.
*/
#define AP_SERVER_BASEVENDOR "Apache Software Foundation"
#define AP_SERVER_BASEPRODUCT "Apache"
#define AP_SERVER_BASEREVISION "2.0b1-dev"
#define AP_SERVER_BASEVERSION AP_SERVER_BASEPRODUCT "/" AP_SERVER_BASEREVISION
#define AP_SERVER_VERSION AP_SERVER_BASEVERSION
Re: cvs commit: httpd-2.0/include release.h httpd.h
Posted by rb...@covalent.net.
I'll protect it immediately.
Ryan
On Sun, 4 Feb 2001, Greg Stein wrote:
> Let's name protect that header file. By including it into httpd.h, then
> everybody who includes that must also find "release.h" ... I'm a bit scared
> that that is too generic.
>
> ap_release.h ?
>
> Cheers,
> -g
>
> On Mon, Feb 05, 2001 at 01:02:27AM -0000, rbb@apache.org wrote:
> > rbb 01/02/04 17:02:27
> >
> > Modified: . CHANGES
> > include httpd.h
> > Added: include release.h
> > Log:
> > Move the server version information out of httpd.h and into release.h.
> > This is in preparation of the first tag with the new tag and release
> > strategy.
> >...
>
> --
> Greg Stein, http://www.lyra.org/
>
>
_______________________________________________________________________________
Ryan Bloom rbb@apache.org
406 29th St.
San Francisco, CA 94131
-------------------------------------------------------------------------------
Re: cvs commit: httpd-2.0/include release.h httpd.h
Posted by Greg Stein <gs...@lyra.org>.
Let's name protect that header file. By including it into httpd.h, then
everybody who includes that must also find "release.h" ... I'm a bit scared
that that is too generic.
ap_release.h ?
Cheers,
-g
On Mon, Feb 05, 2001 at 01:02:27AM -0000, rbb@apache.org wrote:
> rbb 01/02/04 17:02:27
>
> Modified: . CHANGES
> include httpd.h
> Added: include release.h
> Log:
> Move the server version information out of httpd.h and into release.h.
> This is in preparation of the first tag with the new tag and release
> strategy.
>...
--
Greg Stein, http://www.lyra.org/