httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1528438 - in /httpd/httpd/branches/2.4.x: CHANGES LICENSE include/ap_skiplist.h server/Makefile.in server/skiplist.c
Date Wed, 02 Oct 2013 12:20:14 GMT
Author: jim
Date: Wed Oct  2 12:20:14 2013
New Revision: 1528438

URL: http://svn.apache.org/r1528438
Log:
remove... now in apr 1.5

Removed:
    httpd/httpd/branches/2.4.x/include/ap_skiplist.h
    httpd/httpd/branches/2.4.x/server/skiplist.c
Modified:
    httpd/httpd/branches/2.4.x/CHANGES
    httpd/httpd/branches/2.4.x/LICENSE
    httpd/httpd/branches/2.4.x/server/Makefile.in

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1528438&r1=1528437&r2=1528438&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Wed Oct  2 12:20:14 2013
@@ -58,8 +58,6 @@ Changes with Apache 2.4.7
 
   *) modules: Fix some compiler warnings. [Guenter Knauf]
 
-  *) skiplist: Add skiplist capability to httpd [Jim Jagielski]
-
   *) Sync 2.4 and trunk
        - Avoid some memory allocation and work when TRACE1 is not activated
        - fix typo in include guard

Modified: httpd/httpd/branches/2.4.x/LICENSE
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/LICENSE?rev=1528438&r1=1528437&r2=1528438&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/LICENSE (original)
+++ httpd/httpd/branches/2.4.x/LICENSE Wed Oct  2 12:20:14 2013
@@ -544,24 +544,5 @@ CLAIM, DAMAGES OR OTHER LIABILITY, WHETH
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-for the server/skiplist.c component:
-
-/* ======================================================================
- * Copyright (c) 2000,2006 Theo Schlossnagle
- * All rights reserved.
- * The following code was written by Theo Schlossnagle for use in the
- * Backhand project at The Center for Networking and Distributed Systems
- * at The Johns Hopkins University.
- *
- * This is a skiplist implementation to be used for abstract structures
- * and is release under the LGPL license version 2.1 or later.  A copy
- * of this license can be found file LGPL.
- *
- * Alternatively, this file may be licensed under the new BSD license.
- * A copy of this license can be found file BSD.
- *
- * ======================================================================
- */
-
 
 ====================================================================

Modified: httpd/httpd/branches/2.4.x/server/Makefile.in
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/Makefile.in?rev=1528438&r1=1528437&r2=1528438&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/Makefile.in (original)
+++ httpd/httpd/branches/2.4.x/server/Makefile.in Wed Oct  2 12:20:14 2013
@@ -14,8 +14,8 @@ LTLIBRARY_SOURCES = \
 	util_filter.c util_pcre.c util_regex.c exports.c \
 	scoreboard.c error_bucket.c protocol.c core.c request.c provider.c \
 	eoc_bucket.c eor_bucket.c core_filters.c \
-	util_expr_parse.c util_expr_scan.c util_expr_eval.c \
-        skiplist.c
+	util_expr_parse.c util_expr_scan.c util_expr_eval.c
+
 LTLIBRARY_DEPENDENCIES = test_char.h
 
 TARGETS = delete-exports $(LTLIBRARY_NAME) $(CORE_IMPLIB_FILE) export_vars.h httpd.exp



Mime
View raw message