From 76042504a245a2efbc0cf5b04eeabccab35ba3ef Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Thu, 26 Sep 2013 16:46:28 +0000 Subject: [PATCH] Merge r1513492 from trunk: follow up to r1513454: fill in missing log number Submitted by: trawick Reviewed/backported by: jim * util_fcgi API to 2.4.x (allows mod_proxy_fcgi to be kept in sync, along with other less important reasons) trunk: http://svn.apache.org/r1513454 and http://svn.apache.org/r1513492 2.4.x: copy server/util_fcgi.c and include/util_fcgi.h, then apply http://people.apache.org/~trawick/patch-after-copying-util_fcgi-splat.txt +1: trawick, jim, chrisd git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1526598 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 4 ++++ NWGNUmakefile | 1 + STATUS | 6 ------ build/nw_export.inc | 1 + include/ap_mmn.h | 3 ++- libhttpd.dsp | 8 ++++++++ server/Makefile.in | 2 +- 7 files changed, 17 insertions(+), 8 deletions(-) diff --git a/CHANGES b/CHANGES index 408de47955..eabbeefc54 100644 --- a/CHANGES +++ b/CHANGES @@ -14,6 +14,10 @@ Changes with Apache 2.4.7 *) mod_cache: Avoid a crash with strcmp() when the hostname is not provided. [Graham Leggett] + *) core: Add util_fcgi.h and associated definitions and support + routines for FastCGI, based largely on mod_proxy_fcgi. + [Jeff Trawick] + *) mod_headers: Add 'Header note header-name note-name' for copying a response headers value into a note. [Eric Covener] diff --git a/NWGNUmakefile b/NWGNUmakefile index a3a2a50a8b..e382203d4c 100644 --- a/NWGNUmakefile +++ b/NWGNUmakefile @@ -273,6 +273,7 @@ FILES_nlm_objs = \ $(OBJDIR)/util_expr_eval.o \ $(OBJDIR)/util_expr_parse.o \ $(OBJDIR)/util_expr_scan.o \ + $(OBJDIR)/util_fcgi.o \ $(OBJDIR)/util_filter.o \ $(OBJDIR)/util_md5.o \ $(OBJDIR)/util_mutex.o \ diff --git a/STATUS b/STATUS index f30b073643..58b4861b4e 100644 --- a/STATUS +++ b/STATUS @@ -97,12 +97,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - * util_fcgi API to 2.4.x (allows mod_proxy_fcgi to be kept in sync, along - with other less important reasons) - trunk: http://svn.apache.org/r1513454 and http://svn.apache.org/r1513492 - 2.4.x: copy server/util_fcgi.c and include/util_fcgi.h, then apply - http://people.apache.org/~trawick/patch-after-copying-util_fcgi-splat.txt - +1: trawick, jim, chrisd PATCHES PROPOSED TO BACKPORT FROM TRUNK: diff --git a/build/nw_export.inc b/build/nw_export.inc index 0d448ec77a..a97a18191b 100644 --- a/build/nw_export.inc +++ b/build/nw_export.inc @@ -50,6 +50,7 @@ #include "util_charset.h" #include "util_cookies.h" #include "util_ebcdic.h" +#include "util_fcgi.h" #include "util_filter.h" /*#include "util_ldap.h"*/ #include "util_md5.h" diff --git a/include/ap_mmn.h b/include/ap_mmn.h index 4f5ed0677e..b3dbeeccec 100644 --- a/include/ap_mmn.h +++ b/include/ap_mmn.h @@ -420,6 +420,7 @@ * 20120211.23 (2.4.5-dev) Add ap_proxy_clear_connection() * 20120211.24 (2.4.7-dev) add open_htaccess hook. * 20120211.25 (2.4.7-dev) Add conn_sense_e + * 20120211.26 (2.4.7-dev) Add util_fcgi.h, FastCGI protocol support */ #define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */ @@ -427,7 +428,7 @@ #ifndef MODULE_MAGIC_NUMBER_MAJOR #define MODULE_MAGIC_NUMBER_MAJOR 20120211 #endif -#define MODULE_MAGIC_NUMBER_MINOR 25 /* 0...n */ +#define MODULE_MAGIC_NUMBER_MINOR 26 /* 0...n */ /** * Determine if the server's current MODULE_MAGIC_NUMBER is at least a diff --git a/libhttpd.dsp b/libhttpd.dsp index 4e7afad9dc..e983ff4e95 100644 --- a/libhttpd.dsp +++ b/libhttpd.dsp @@ -577,6 +577,14 @@ SOURCE=.\server\util_expr_parse.c # End Source File # Begin Source File +SOURCE=.\server\util_fcgi.c +# End Source File +# Begin Source File + +SOURCE=.\include\util_fcgi.h +# End Source File +# Begin Source File + SOURCE=.\server\util_filter.c # End Source File # Begin Source File diff --git a/server/Makefile.in b/server/Makefile.in index e1e052eb19..46f7788074 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -7,7 +7,7 @@ SUBDIRS = mpm LTLIBRARY_NAME = libmain.la LTLIBRARY_SOURCES = \ - config.c log.c main.c vhost.c util.c \ + config.c log.c main.c vhost.c util.c util_fcgi.c \ util_script.c util_md5.c util_cfgtree.c util_ebcdic.c util_time.c \ connection.c listen.c util_mutex.c mpm_common.c mpm_unix.c \ util_charset.c util_cookies.c util_debug.c util_xml.c \