This commit was manufactured by cvs2svn to create tag 'APACHE_1_3_9'.APACHE_1_3_9

git-svn-id: http://svn.apache.org/repos/asf/apr/apr/tags/APACHE_1_3_9@59168 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 0 insertions, 361 deletions

diff --git a/locks/win32/locks.c b/locks/win32/locks.c
deleted file mode 100644
index f7d38933a..000000000
--- a/locks/win32/locks.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/* ====================================================================
- * Copyright (c) 1999 The Apache Group.  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. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the Apache Group
- *    for use in the Apache HTTP server project (http://www.apache.org/)."
- *
- * 4. The names "Apache Server" and "Apache Group" 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 names without prior written
- *    permission of the Apache Group.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the Apache Group
- *    for use in the Apache HTTP server project (http://www.apache.org/)."
- *
- * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``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 GROUP 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 Group.
- * For more information on the Apache Group and the Apache HTTP server
- * project, please see <http://www.apache.org/>.
- *
- */
-
-#include "apr_general.h"
-#include "apr_lib.h"
-#include "locks.h"
-#include "apr_portable.h"
-
-ap_status_t ap_create_lock(ap_context_t *cont, ap_locktype_e type, char *fname, struct lock_t **lock)
-{
-    struct lock_t *newlock;
-    SECURITY_ATTRIBUTES sec;
-
-    newlock = (struct lock_t *)ap_palloc(cont, sizeof(struct lock_t));
-
-    newlock->cntxt = cont;
-    newlock->fname = strdup(fname);
-
-    sec.nLength = sizeof(SECURITY_ATTRIBUTES);
-    sec.lpSecurityDescriptor = NULL;
-
-    if (type == APR_CROSS_PROCESS || type == APR_LOCKALL) {
-        sec.bInheritHandle = TRUE;
-    }
-    else {
-        sec.bInheritHandle = FALSE;
-    }
-
-    newlock->mutex = CreateMutex(&sec, FALSE, fname);
-    *lock = newlock;
-    return APR_SUCCESS;
-}
-
-ap_status_t ap_child_init_lock(ap_context_t *cont, char *fname, struct lock_t **lock)
-{
-    (*lock) = (struct lock_t *)ap_palloc(cont, sizeof(struct lock_t));
-
-    if ((*lock) == NULL) {
-        return APR_ENOMEM;
-    }
-
-    (*lock)->fname = strdup(fname);
-    (*lock)->mutex = OpenMutex(MUTEX_ALL_ACCESS, TRUE, fname);
-    
-    if ((*lock)->mutex == NULL) {
-        return APR_EEXIST;
-    }
-    return APR_SUCCESS;
-}
-
-ap_status_t ap_lock(struct lock_t *lock)
-{
-    DWORD rv;
-
-    rv = WaitForSingleObject(lock->mutex, INFINITE);
-
-    if (rv == WAIT_OBJECT_0 || rv == WAIT_ABANDONED) {
-        return APR_SUCCESS;
-    }
-    if (rv == WAIT_TIMEOUT) {
-        return APR_TIMEUP;
-    }
-
-    return APR_EEXIST;
-}
-
-ap_status_t ap_unlock(struct lock_t *lock)
-{
-    if (ReleaseMutex(lock->mutex) == 0) {
-        return APR_EEXIST;
-    }
-    return APR_SUCCESS;
-}
-
-ap_status_t ap_destroy_lock(struct lock_t *lock)
-{
-    if (CloseHandle(lock->mutex) == 0) {
-        return APR_EEXIST;
-    }
-    return APR_SUCCESS;
-}
-
-ap_status_t ap_get_lockdata(struct lock_t *lock, void *data)
-{
-    if (lock != NULL) {
-        return ap_get_userdata(lock->cntxt, &data);
-    }
-    else {
-        data = NULL;
-        return APR_ENOLOCK;
-    }
-}
-
-ap_status_t ap_set_lockdata(struct lock_t *lock, void *data)
-{
-    if (lock != NULL) {
-        return ap_set_userdata(lock->cntxt, data);
-    }
-    else {
-        data = NULL;
-        return APR_ENOLOCK;
-    }
-}
-
-ap_status_t ap_get_os_lock(struct lock_t *lock, ap_os_lock_t *thelock)
-{
-    if (lock == NULL) {
-        return APR_ENOFILE;
-    }
-    thelock = &(lock->mutex);
-    return APR_SUCCESS;
-}
-
-ap_status_t ap_put_os_lock(ap_context_t *cont, struct lock_t **lock, 
-                            ap_os_lock_t *thelock)
-{
-    if (cont == NULL) {
-        return APR_ENOCONT;
-    }
-    if ((*lock) == NULL) {
-        (*lock) = (struct lock_t *)ap_palloc(cont, sizeof(struct lock_t));
-        (*lock)->cntxt = cont;
-    }
-    (*lock)->mutex = *thelock;
-    return APR_SUCCESS;
-}    
diff --git a/locks/win32/locks.def b/locks/win32/locks.def
deleted file mode 100644
index b52c3b18e..000000000
--- a/locks/win32/locks.def
+++ /dev/null
@@ -1,15 +0,0 @@
-; locks.def : 
-
-LIBRARY locks
-DESCRIPTION ''
-
-EXPORTS
-	; Add new API calls to the end of this list.
-	ap_create_lock   @1
-    ap_lock   @2
-    ap_unlock   @3
-    ap_destroy_lock   @4
-    ap_child_init_lock   @5
-    ap_get_lockdata   @6
-    ap_set_lockdata   @7
-    ap_get_os_lock   @8
\ No newline at end of file
diff --git a/locks/win32/locks.dsp b/locks/win32/locks.dsp
deleted file mode 100644
index d713a6795..000000000
--- a/locks/win32/locks.dsp
+++ /dev/null
@@ -1,101 +0,0 @@
-# Microsoft Developer Studio Project File - Name="locks" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 5.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=locks - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "locks.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "locks.mak" CFG="locks - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "locks - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "locks - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "locks - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\include ..\..\inc" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-
-!ELSEIF  "$(CFG)" == "locks - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\include" /I "..\..\include" /I "..\..\inc" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\lib\debug\lib.lib ..\..\misc\win32\debug\misc.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "locks - Win32 Release"
-# Name "locks - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\locks.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\locks.def
-# End Source File
-# Begin Source File
-
-SOURCE=.\locks.h
-# End Source File
-# End Target
-# End Project
diff --git a/locks/win32/locks.h b/locks/win32/locks.h
deleted file mode 100644
index 7ae4f7031..000000000
--- a/locks/win32/locks.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ====================================================================
- * Copyright (c) 1999 The Apache Group.  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. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the Apache Group
- *    for use in the Apache HTTP server project (http://www.apache.org/)."
- *
- * 4. The names "Apache Server" and "Apache Group" 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 names without prior written
- *    permission of the Apache Group.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the Apache Group
- *    for use in the Apache HTTP server project (http://www.apache.org/)."
- *
- * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``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 GROUP 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 Group.
- * For more information on the Apache Group and the Apache HTTP server
- * project, please see <http://www.apache.org/>.
- *
- */
-#ifndef LOCKS_H
-#define LOCKS_H
-
-#include "apr_lock.h"
-
-struct lock_t {
-    ap_context_t *cntxt;
-    HANDLE mutex;
-    char *fname;
-};
-
-#endif  /* LOCKS_H */
-