You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2013/09/26 18:46:29 UTC
svn commit: r1526598 - in /httpd/httpd/branches/2.4.x: ./ CHANGES
NWGNUmakefile STATUS build/nw_export.inc docs/manual/ docs/manual/howto/
docs/manual/mod/ docs/manual/mod/mod_macro.xml docs/manual/rewrite/
include/ap_mmn.h libhttpd.dsp server/Makefile.in
Author: jim
Date: Thu Sep 26 16:46:28 2013
New Revision: 1526598
URL: http://svn.apache.org/r1526598
Log:
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
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/CHANGES
httpd/httpd/branches/2.4.x/NWGNUmakefile
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/build/nw_export.inc
httpd/httpd/branches/2.4.x/docs/manual/ (props changed)
httpd/httpd/branches/2.4.x/docs/manual/howto/ (props changed)
httpd/httpd/branches/2.4.x/docs/manual/mod/ (props changed)
httpd/httpd/branches/2.4.x/docs/manual/mod/mod_macro.xml (props changed)
httpd/httpd/branches/2.4.x/docs/manual/rewrite/ (props changed)
httpd/httpd/branches/2.4.x/include/ap_mmn.h
httpd/httpd/branches/2.4.x/libhttpd.dsp
httpd/httpd/branches/2.4.x/server/Makefile.in
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1513492
Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1526598&r1=1526597&r2=1526598&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Thu Sep 26 16:46:28 2013
@@ -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]
Modified: httpd/httpd/branches/2.4.x/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/NWGNUmakefile?rev=1526598&r1=1526597&r2=1526598&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/NWGNUmakefile (original)
+++ httpd/httpd/branches/2.4.x/NWGNUmakefile Thu Sep 26 16:46:28 2013
@@ -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 \
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1526598&r1=1526597&r2=1526598&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Thu Sep 26 16:46:28 2013
@@ -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:
Modified: httpd/httpd/branches/2.4.x/build/nw_export.inc
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/build/nw_export.inc?rev=1526598&r1=1526597&r2=1526598&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/build/nw_export.inc (original)
+++ httpd/httpd/branches/2.4.x/build/nw_export.inc Thu Sep 26 16:46:28 2013
@@ -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"
Propchange: httpd/httpd/branches/2.4.x/docs/manual/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk/docs/manual:r1513492
Propchange: httpd/httpd/branches/2.4.x/docs/manual/howto/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk/docs/manual/howto:r1513492
Propchange: httpd/httpd/branches/2.4.x/docs/manual/mod/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk/docs/manual/mod:r1513492
Propchange: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_macro.xml
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk/docs/manual/mod/mod_macro.xml:r1513492
Propchange: httpd/httpd/branches/2.4.x/docs/manual/rewrite/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk/docs/manual/rewrite:r1513492
Modified: httpd/httpd/branches/2.4.x/include/ap_mmn.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/include/ap_mmn.h?rev=1526598&r1=1526597&r2=1526598&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/include/ap_mmn.h (original)
+++ httpd/httpd/branches/2.4.x/include/ap_mmn.h Thu Sep 26 16:46:28 2013
@@ -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
Modified: httpd/httpd/branches/2.4.x/libhttpd.dsp
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/libhttpd.dsp?rev=1526598&r1=1526597&r2=1526598&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/libhttpd.dsp (original)
+++ httpd/httpd/branches/2.4.x/libhttpd.dsp Thu Sep 26 16:46:28 2013
@@ -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
Modified: httpd/httpd/branches/2.4.x/server/Makefile.in
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/Makefile.in?rev=1526598&r1=1526597&r2=1526598&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/Makefile.in (original)
+++ httpd/httpd/branches/2.4.x/server/Makefile.in Thu Sep 26 16:46:28 2013
@@ -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 \