Commit 8686a3f8 authored by Jeff Trawick's avatar Jeff Trawick
Browse files

enable DEFAULT_REL_RUNTIMEDIR on NetWare and Windows 

this commit is missing the Windows and NetWare build
logic to copy the appropriate file to include/ap_config_layout.h


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1086073 13f79535-47bb-0310-9956-ffa450edef68
parent c38066d6

CHANGES

+2 −0
Changes for CHANGES: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 


Changes with Apache 2.3.12



  *) Enable DEFAULT_REL_RUNTIMEDIR on Windows and NetWare.  [various]



  *) Correct C++ incompatibility with http_log.h.  [Stefan Fritsch, Jeff

     Trawick]

include/ap_config.h

+2 −1
Changes for include/ap_config.h: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -232,8 +232,9 @@ 
#include "os.h"

#if (!defined(WIN32) && !defined(NETWARE)) || defined(__MINGW32__)

#include "ap_config_auto.h"

#include "ap_config_layout.h"

#endif

#include "ap_config_layout.h"



#if defined(NETWARE)

#define AP_NONBLOCK_WHEN_MULTI_LISTEN 1

#endif

modules/cache/mod_socache_dbm.c

+0 −5
Changes for modules/cache/mod_socache_dbm.c: 0 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -53,12 +53,7 @@ struct ap_socache_instance_t { 
 */

#define DBM_FILE_MODE ( APR_UREAD | APR_UWRITE | APR_GREAD | APR_WREAD )



/* Check for definition of DEFAULT_REL_RUNTIMEDIR */

#ifndef DEFAULT_REL_RUNTIMEDIR

#define DEFAULT_DBM_PREFIX "logs/socache-dbm-"

#else

#define DEFAULT_DBM_PREFIX DEFAULT_REL_RUNTIMEDIR "/socache-dbm-"

#endif



/* ### this should use apr_dbm_usednames. */

#if !defined(DBM_FILE_SUFFIX_DIR) && !defined(DBM_FILE_SUFFIX_PAG)

modules/cache/mod_socache_shmcb.c

+0 −5
Changes for modules/cache/mod_socache_shmcb.c: 0 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -32,12 +32,7 @@ 


#define SHMCB_MAX_SIZE (64 * 1024 * 1024)



/* Check for definition of DEFAULT_REL_RUNTIMEDIR */

#ifndef DEFAULT_REL_RUNTIMEDIR

#define DEFAULT_SHMCB_PREFIX "logs/socache-shmcb-"

#else

#define DEFAULT_SHMCB_PREFIX DEFAULT_REL_RUNTIMEDIR "/socache-shmcb-"

#endif



#define DEFAULT_SHMCB_SUFFIX ".cache"

os/netware/netware_config_layout.h

0 → 100644
+31 −0
Changes for os/netware/netware_config_layout.h: 31 added lines, 0 removed lines.
Original line number Diff line number Diff line 
/* Licensed to the Apache Software Foundation (ASF) under one or more

 * contributor license agreements.  See the NOTICE file distributed with

 * this work for additional information regarding copyright ownership.

 * The ASF licenses this file to You under the Apache License, Version 2.0

 * (the "License"); you may not use this file except in compliance with

 * the License.  You may obtain a copy of the License at

 *

 *     http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



/**

 * @file netware/netware_config_layout.h

 * @brief This provides layout definitions for non-autoconf-based NetWare

 * builds, and is copied to include/ap_config_layout.h during the build.

 */



#ifndef AP_CONFIG_LAYOUT_H

#define AP_CONFIG_LAYOUT_H



/* Check for definition of DEFAULT_REL_RUNTIMEDIR */

#ifndef DEFAULT_REL_RUNTIMEDIR

#define DEFAULT_REL_RUNTIMEDIR "logs"

#endif



#endif /* AP_CONFIG_LAYOUT_H */