Added apreq to NetWare build. (a57712ff) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP Apache Httpd

NWGNUmakefile

+11 −0

Changes for NWGNUmakefile: 11 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -226,6 +226,17 @@ TARGET_lib = \
		# Paths must all use the '/' character
		#
		FILES_nlm_objs = \
		$(OBJDIR)/apreq_cookie.o \
		$(OBJDIR)/apreq_error.o \
		$(OBJDIR)/apreq_module.o \
		$(OBJDIR)/apreq_module_cgi.o \
		$(OBJDIR)/apreq_module_custom.o \
		$(OBJDIR)/apreq_param.o \
		$(OBJDIR)/apreq_parser.o \
		$(OBJDIR)/apreq_parser_header.o \
		$(OBJDIR)/apreq_parser_multipart.o \
		$(OBJDIR)/apreq_parser_urlencoded.o \
		$(OBJDIR)/apreq_util.o \
		$(OBJDIR)/buildmark.o \
		$(OBJDIR)/config.o \
		$(OBJDIR)/connection.o \

build/make_nw_export.awk

+2 −2

Changes for build/make_nw_export.awk: 2 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -29,8 +29,8 @@ function add_symbol(sym_name) {
		#/ap_some_name/{next}
		/ap_mpm_pod_/{next}

		/^[ \t](AP\|DAV)([RU]\|_CORE)?_DECLARE[^(][(][^)][)]([^ ] )*[^(]+[(]/ {
		sub("[ \t](AP\|DAV)([RU]\|_CORE)?_DECLARE[^(][(][^)][)][ \t]", "")
		/^[ \t](AP\|DAV)([RU]\|REQ\|_CORE)?_DECLARE[^(][(][^)][)]([^ ] )*[^(]+[(]/ {
		sub("[ \t](AP\|DAV)([RU]\|REQ\|_CORE)?_DECLARE[^(][(][^)][)][ \t]", "")
		sub("[(].*", "")
		sub("([^ ]* (^([ \t]*[(])))+", "")
		add_symbol($0)

build/nw_export.inc

+12 −0

Changes for build/nw_export.inc: 12 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -23,6 +23,12 @@
		#define APR_DECLARE_OPTIONAL_FN APR_DECLARE_OPTIONAL_FN
		#undef APR_DECLARE_EXTERNAL_HOOK
		#define APR_DECLARE_EXTERNAL_HOOK APR_DECLARE_EXTERNAL_HOOK
		#undef APREQ_DECLARE
		#define APREQ_DECLARE APREQ_DECLARE
		#undef APREQ_DECLARE_NONSTD
		#define APREQ_DECLARE_NONSTD APREQ_DECLARE_NONSTD
		#undef APREQ_DECLARE_DATA
		#define APREQ_DECLARE_DATA APREQ_DECLARE_DATA
		#undef APACHE_OS_H

		#include "httpd.h"
		@@ -35,6 +41,12 @@
		#include "ap_provider.h"
		#include "ap_release.h"
		#include "ap_expr.h"
		#include "apreq_cookie.h"
		#include "apreq_error.h"
		#include "apreq_module.h"
		#include "apreq_param.h"
		#include "apreq_parser.h"
		#include "apreq_util.h"
		#include "http_config.h"
		#include "http_connection.h"
		#include "http_core.h"

include/ap_config.h

+46 −0

Changes for include/ap_config.h: 46 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -102,6 +102,52 @@
		#define AP_DECLARE_DATA __declspec(dllimport)
		#endif

		#if !defined(WIN32)
		/**
		* The public APREQ functions are declared with APREQ_DECLARE(), so they may
		* use the most appropriate calling convention. Public APR functions with
		* variable arguments must use APR_DECLARE_NONSTD().
		*
		* @remark Both the declaration and implementations must use the same macro.
		*/
		/** APREQ_DECLARE(rettype) apeq_func(args)
		*/
		#define APREQ_DECLARE(d) APR_DECLARE(d)
		/**
		* The public APEQ functions using variable arguments are declared with
		* APEQ_DECLARE_NONSTD(), as they must follow the C language calling convention.
		* @see APEQ_DECLARE @see APEQ_DECLARE_DATA
		* @remark Both the declaration and implementations must use the same macro.
		* @example
		*/
		/** APEQ_DECLARE_NONSTD(rettype) apr_func(args, ...);
		*/
		#define APREQ_DECLARE_NONSTD(d) APR_DECLARE_NONSTD(d)
		/**
		* The public APREQ variables are declared with APREQ_DECLARE_DATA.
		* This assures the appropriate indirection is invoked at compile time.
		* @see APREQ_DECLARE @see APREQ_DECLARE_NONSTD
		* @remark Note that the declaration and implementations use different forms,
		* but both must include the macro.
		*/
		/** extern APREQ_DECLARE_DATA type apr_variable;\n
		* APREQ_DECLARE_DATA type apr_variable = value;
		*/
		#define APREQ_DECLARE_DATA
		#elif defined (APREQ_DECLARE_STATIC)
		#define APREQ_DECLARE(type) type __stdcall
		#define APREQ_DECLARE_NONSTD(type) type
		#define APREQ_DECLARE_DATA
		#elif defined (APREQ_DECLARE_EXPORT)
		#define APREQ_DECLARE(type) __declspec(dllexport) type __stdcall
		#define APREQ_DECLARE_NONSTD(type) __declspec(dllexport) type
		#define APREQ_DECLARE_DATA __declspec(dllexport)
		#else
		#define APREQ_DECLARE(type) __declspec(dllimport) type __stdcall
		#define APREQ_DECLARE_NONSTD(type) __declspec(dllimport) type
		#define APREQ_DECLARE_DATA __declspec(dllimport)
		#endif

		#if !defined(WIN32) \|\| defined(AP_MODULE_DECLARE_STATIC)
		/**
		* Declare a dso module's exported module structure as AP_MODULE_DECLARE_DATA.

include/apreq.h

+2 −47

Changes for include/apreq.h: 2 added lines, 47 removed lines.
Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@
		#include <assert.h>
		#endif

		#include "ap_config.h"
		#include "apr_tables.h"
		#include <stddef.h>

		@@ -34,55 +35,9 @@
		* @brief Main header file...
		* @ingroup libapreq2
		*
		* Define the generic APREQ_ macros and common data structures.
		* Define the common data structures.
		*/

		#ifndef WIN32
		/**
		* The public APREQ functions are declared with APREQ_DECLARE(), so they may
		* use the most appropriate calling convention. Public APR functions with
		* variable arguments must use APR_DECLARE_NONSTD().
		*
		* @remark Both the declaration and implementations must use the same macro.
		*/
		/** APREQ_DECLARE(rettype) apeq_func(args)
		*/
		#define APREQ_DECLARE(d) APR_DECLARE(d)
		/**
		* The public APEQ functions using variable arguments are declared with
		* APEQ_DECLARE_NONSTD(), as they must follow the C language calling convention.
		* @see APEQ_DECLARE @see APEQ_DECLARE_DATA
		* @remark Both the declaration and implementations must use the same macro.
		* @example
		*/
		/** APEQ_DECLARE_NONSTD(rettype) apr_func(args, ...);
		*/
		#define APREQ_DECLARE_NONSTD(d) APR_DECLARE_NONSTD(d)
		/**
		* The public APREQ variables are declared with APREQ_DECLARE_DATA.
		* This assures the appropriate indirection is invoked at compile time.
		* @see APREQ_DECLARE @see APREQ_DECLARE_NONSTD
		* @remark Note that the declaration and implementations use different forms,
		* but both must include the macro.
		*/
		/** extern APREQ_DECLARE_DATA type apr_variable;\n
		* APREQ_DECLARE_DATA type apr_variable = value;
		*/
		#define APREQ_DECLARE_DATA
		#elif defined (APREQ_DECLARE_STATIC)
		#define APREQ_DECLARE(type) type __stdcall
		#define APREQ_DECLARE_NONSTD(type) type
		#define APREQ_DECLARE_DATA
		#elif defined (APREQ_DECLARE_EXPORT)
		#define APREQ_DECLARE(type) __declspec(dllexport) type __stdcall
		#define APREQ_DECLARE_NONSTD(type) __declspec(dllexport) type
		#define APREQ_DECLARE_DATA __declspec(dllexport)
		#else
		#define APREQ_DECLARE(type) __declspec(dllimport) type __stdcall
		#define APREQ_DECLARE_NONSTD(type) __declspec(dllimport) type
		#define APREQ_DECLARE_DATA __declspec(dllimport)
		#endif

		/**
		* Read chucks of data in 64k blocks from the request
		*/