(b4e6bee1) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP Apache Httpd

include/http_config.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -525,7 +525,7 @@ AP_DECLARE_NONSTD(const char ) ap_set_deprecated(cmd_parms cmd, void *struct_p
		* @param p pool to allocate data from
		* @param fname The file name
		*/
		AP_DECLARE(const char ) ap_server_root_relative(apr_pool_t p, const char *fname);
		AP_DECLARE(char ) ap_server_root_relative(apr_pool_t p, const char *fname);

		/* Finally, the hook for dynamically loading modules in... */

include/httpd.h

+13 −0

Original line number	Diff line number	Diff line
		@@ -1275,9 +1275,22 @@ AP_DECLARE(char ) ap_make_dirstr_parent(apr_pool_t p, const char *s);
		* @param dir The directory name
		* @param f The filename
		* @return A copy of the full path
		* @tip Never consider using this function if you are dealing with filesystem
		* names that need to remain canonical, unless you are merging an apr_dir_read
		* path and returned filename. Otherwise, the result is not canonical.
		*/
		AP_DECLARE(char ) ap_make_full_path(apr_pool_t a, const char dir, const char f);

		/**
		* Test if the given path has an an absolute path.
		* @param p The pool to allocate from
		* @param dir The directory name
		* @tip The converse is not necessarily true, some OS's (Win32/OS2/Netware) have
		* multiple forms of absolute paths. This only reports if the path is absolute
		* in a canonical sense.
		*/
		AP_DECLARE(int) ap_os_is_path_absolute(apr_pool_t p, const char dir);

		/**
		* Does the provided string contain wildcard characters? This is useful
		* for determining if the string should be passed to strcmp_match or to strcmp.

os/beos/os.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -68,11 +68,6 @@
		#include "ap_mpm.h" /* needed for definition of
		* ap_os_create_privileged_process */

		int ap_os_is_path_absolute(const char *file)
		{
		return file[0] == '/';
		}

		AP_DECLARE(apr_status_t) ap_os_create_privileged_process(
		const request_rec *r,
		apr_proc_t newproc, const char progname,

os/beos/os.h

+0 −11

Original line number	Diff line number	Diff line
		@@ -69,15 +69,4 @@
		#endif
		#endif

		/*
		* This file is included in all Apache source code. It contains definitions
		* of facilities available on _this_ operating system (HAVE_* macros),
		* and prototypes of OS specific functions defined in os.c or os-inline.c
		*/

		extern int ap_os_is_path_absolute(const char *file);
		#define ap_os_canonical_filename(p,f) (f)
		#define ap_os_case_canonical_filename(p,f) (f)
		#define ap_os_systemcase_filename(p,f) (f)

		#endif /* !APACHE_OS_H */

os/bs2000/os-inline.c

deleted100644 → 0

+0 −87

Original line number	Diff line number	Diff line
		/* ====================================================================
		* The Apache Software License, Version 1.1
		*
		* Copyright (c) 2000-2001 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.
		*/

		/*
		* This file contains functions which can be inlined if the compiler
		* has an "inline" modifier. Because of this, this file is both a
		* header file and a compilable module.
		*
		* Only inlineable functions should be defined in here. They must all
		* include the APR_INLINE modifier.
		*
		* If the compiler supports inline, this file will be #included as a
		* header file from os.h to create all the inline function
		* definitions. APR_INLINE will be defined to whatever is required on
		* function definitions to make them inline declarations.
		*
		* If the compiler does not support inline, this file will be compiled
		* as a normal C file into libos.a (along with os.c). In this case
		* APR_HAS_INLINE will be zero so we can use this to test if we are
		* compiling this source file.
		*/

		#include "apr.h"

		#if APR_HAS_INLINE
		/* keep inlined functions private to the including file */
		static
		#endif
		APR_INLINE int ap_os_is_path_absolute(const char *file)
		{
		return file[0] == '/';
		}