From: Jim Jagielski Date: Mon, 24 Apr 2006 17:17:00 +0000 (+0000) Subject: And bump to 1.3.36-dev X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f9a104767e099be948f17f08375f34d65f3c114;p=thirdparty%2Fapache%2Fhttpd.git And bump to 1.3.36-dev git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@396613 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index cdaf736f87d..888b2f0d718 100644 --- a/STATUS +++ b/STATUS @@ -3,6 +3,7 @@ APACHE 1.3 STATUS: -*-text-*- Release: + 1.3.36: In development 1.3.35: Tagged April 24, 2006. 1.3.34: Tagged October 13, 2005. Announced October 18, 2005 1.3.33: Tagged October 27, 2004. Announced October 29, 2004. diff --git a/src/CHANGES b/src/CHANGES index e162ac22f37..7dfc86bc5d3 100644 --- a/src/CHANGES +++ b/src/CHANGES @@ -1,3 +1,6 @@ +Changes with Apache 1.3.36 + + Changes with Apache 1.3.35 *) SECURITY: CVE-2005-3352 (cve.mitre.org) diff --git a/src/Configure b/src/Configure index 789a40675af..24448a4ae18 100755 --- a/src/Configure +++ b/src/Configure @@ -1935,7 +1935,7 @@ if [ "x$using_shlib" = "x1" ] ; then # select the special subtarget for shared core generation SUBTARGET=target_shared # determine additional suffixes for libhttpd.so - V=1 R=3 P=35 + V=1 R=3 P=36 if [ "x$SHLIB_SUFFIX_DEPTH" = "x0" ]; then SHLIB_SUFFIX_LIST="" fi diff --git a/src/include/httpd.h b/src/include/httpd.h index 10491185cc0..7572e12f278 100644 --- a/src/include/httpd.h +++ b/src/include/httpd.h @@ -388,7 +388,7 @@ extern "C" { #define SERVER_BASEVENDOR "Apache Group" #define SERVER_BASEPRODUCT "Apache" -#define SERVER_BASEREVISION "1.3.35" +#define SERVER_BASEREVISION "1.3.36-dev" #define SERVER_BASEVERSION SERVER_BASEPRODUCT "/" SERVER_BASEREVISION #define SERVER_PRODUCT SERVER_BASEPRODUCT @@ -409,7 +409,7 @@ API_EXPORT(const char *) ap_get_server_built(void); * Always increases along the same track as the source branch. * For example, Apache 1.4.2 would be '10402100', 2.5b7 would be '20500007'. */ -#define APACHE_RELEASE 10335100 +#define APACHE_RELEASE 10336000 #define SERVER_PROTOCOL "HTTP/1.1" #ifndef SERVER_SUPPORT