You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ro...@apache.org on 2006/04/22 05:44:07 UTC
svn commit: r396063 - in /httpd/httpd/trunk: modules/proxy/config.m4
modules/proxy/fcgi_protocol.h modules/proxy/mod_proxy_balancer.c
modules/proxy/mod_proxy_fcgi.c support/ support/Makefile.in
support/fcgistarter.c
Author: rooneg
Date: Fri Apr 21 20:44:05 2006
New Revision: 396063
URL: http://svn.apache.org/viewcvs?rev=396063&view=rev
Log:
Merge the fcgi-proxy-dev branch to trunk, adding a FastCGI back end for
mod_proxy. This log message is just a summary of the changes, for the
full original log messages see r357431:393955 in branches/fcgi-proxy-dev.
* modules/proxy/mod_proxy_fcgi.c: New file, holds the impementation of
our new fcgi backend for mod_proxy.
* modules/proxy/fcgi_protocol.h: New file, holds constants and structures
for the fcgi protocol.
* modules/proxy/mod_proxy_balancer.c
(proxy_balancer_canon): Set up r->path_info, so the PATH_INFO env
variable is correctly passed on to balancer workers.
* modules/proxy/config.m4: Build the new mod_proxy_fcgi module.
* support: Add fcgistarter to svn:ignore.
* support/Makefile.in: Build the new fcgistarter program.
* support/fcgistarter.c: New program, a helper for starting fcgi worker
processes.
Added:
httpd/httpd/trunk/modules/proxy/fcgi_protocol.h
- copied unchanged from r393955, httpd/httpd/branches/fcgi-proxy-dev/modules/proxy/fcgi_protocol.h
httpd/httpd/trunk/modules/proxy/mod_proxy_fcgi.c
- copied unchanged from r393955, httpd/httpd/branches/fcgi-proxy-dev/modules/proxy/mod_proxy_fcgi.c
httpd/httpd/trunk/support/fcgistarter.c
- copied unchanged from r393955, httpd/httpd/branches/fcgi-proxy-dev/support/fcgistarter.c
Modified:
httpd/httpd/trunk/modules/proxy/config.m4
httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c
httpd/httpd/trunk/support/ (props changed)
httpd/httpd/trunk/support/Makefile.in
Modified: httpd/httpd/trunk/modules/proxy/config.m4
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/proxy/config.m4?rev=396063&r1=396062&r2=396063&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/config.m4 (original)
+++ httpd/httpd/trunk/modules/proxy/config.m4 Fri Apr 21 20:44:05 2006
@@ -16,6 +16,7 @@
proxy_connect_objs="mod_proxy_connect.lo"
proxy_ftp_objs="mod_proxy_ftp.lo"
proxy_http_objs="mod_proxy_http.lo"
+proxy_fcgi_objs="mod_proxy_fcgi.lo"
proxy_ajp_objs="mod_proxy_ajp.lo ajp_header.lo ajp_link.lo ajp_msg.lo"
proxy_balancer_objs="mod_proxy_balancer.lo"
@@ -26,6 +27,7 @@
proxy_connect_objs="$proxy_connect_objs mod_proxy.la"
proxy_ftp_objs="$proxy_ftp_objs mod_proxy.la"
proxy_http_objs="$proxy_http_objs mod_proxy.la"
+ proxy_fcgi_objs="$proxy_fcgi_objs mod_proxy.la"
proxy_ajp_objs="$proxy_ajp_objs mod_proxy.la"
proxy_balancer_objs="$proxy_balancer_objs mod_proxy.la"
;;
@@ -34,6 +36,7 @@
APACHE_MODULE(proxy_connect, Apache proxy CONNECT module, $proxy_connect_objs, , $proxy_mods_enable)
APACHE_MODULE(proxy_ftp, Apache proxy FTP module, $proxy_ftp_objs, , $proxy_mods_enable)
APACHE_MODULE(proxy_http, Apache proxy HTTP module, $proxy_http_objs, , $proxy_mods_enable)
+APACHE_MODULE(proxy_fcgi, Apache proxy FastCGI module, $proxy_fcgi_objs, , $proxy_mods_enable)
APACHE_MODULE(proxy_ajp, Apache proxy AJP module, $proxy_ajp_objs, , $proxy_mods_enable)
APACHE_MODULE(proxy_balancer, Apache proxy BALANCER module, $proxy_balancer_objs, , $proxy_mods_enable)
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c?rev=396063&r1=396062&r2=396063&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c Fri Apr 21 20:44:05 2006
@@ -75,6 +75,9 @@
r->filename = apr_pstrcat(r->pool, "proxy:balancer://", host,
"/", path, (search) ? "?" : "", (search) ? search : "", NULL);
+
+ r->path_info = apr_pstrcat(r->pool, "/", path, NULL);
+
return OK;
}
Propchange: httpd/httpd/trunk/support/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Apr 21 20:44:05 2006
@@ -37,3 +37,4 @@
*.vcproj
*.vcproj.*
httxt2dbm
+fcgistarter
Modified: httpd/httpd/trunk/support/Makefile.in
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/support/Makefile.in?rev=396063&r1=396062&r2=396063&view=diff
==============================================================================
--- httpd/httpd/trunk/support/Makefile.in (original)
+++ httpd/httpd/trunk/support/Makefile.in Fri Apr 21 20:44:05 2006
@@ -3,7 +3,7 @@
CLEAN_TARGETS = suexec
-PROGRAMS = htpasswd htdigest rotatelogs logresolve ab checkgid htdbm htcacheclean httxt2dbm
+PROGRAMS = htpasswd htdigest rotatelogs logresolve ab checkgid htdbm htcacheclean httxt2dbm fcgistarter
TARGETS = $(PROGRAMS)
PROGRAM_LDADD = $(UTIL_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS)
@@ -70,3 +70,6 @@
httxt2dbm: $(httxt2dbm_OBJECTS)
$(LINK) $(httxt2dbm_LTFLAGS) $(httxt2dbm_OBJECTS) $(PROGRAM_LDADD)
+fcgistarter_OBJECTS = fcgistarter.lo
+fcgistarter: $(fcgistarter_OBJECTS)
+ $(LINK) $(fcgistarter_LTFLAGS) $(fcgistarter_OBJECTS) $(PROGRAM_LDADD)
Re: svn commit: r396063 - in /httpd/httpd/trunk: modules/proxy/config.m4 modules/proxy/fcgi_protocol.h modules/proxy/mod_proxy_balancer.c modules/proxy/mod_proxy_fcgi.c support/ support/Makefile.in support/fcgistarter.c
Posted by Garrett Rooney <ro...@electricjellyfish.net>.
On 4/28/06, Joe Orton <jo...@redhat.com> wrote:
> On Sat, Apr 22, 2006 at 03:44:07AM -0000, rooneg@apache.org wrote:
> > Author: rooneg
> > Date: Fri Apr 21 20:44:05 2006
> > New Revision: 396063
> >
> > URL: http://svn.apache.org/viewcvs?rev=396063&view=rev
> > Log:
> > Merge the fcgi-proxy-dev branch to trunk, adding a FastCGI back end for
> > mod_proxy. This log message is just a summary of the changes, for the
> > full original log messages see r357431:393955 in branches/fcgi-proxy-dev.
>
> This code has the following gcc (4.1 on x86_64) warnings:
>
> mod_proxy_fcgi.c: In function 'send_environment':
> mod_proxy_fcgi.c:269: warning: implicit declaration of function 'ap_add_common_vars'
> mod_proxy_fcgi.c:270: warning: implicit declaration of function 'ap_add_cgi_vars'
> mod_proxy_fcgi.c: In function 'handle_headers':
> mod_proxy_fcgi.c:467: warning: implicit declaration of function 'ap_scan_script_header_err_brigade'
> mod_proxy_fcgi.c: In function 'dispatch':
> mod_proxy_fcgi.c:677: warning: format '%d' expects type 'int', but argument 7 has type 'apr_size_t'
> mod_proxy_fcgi.c: In function 'proxy_fcgi_handler':
> mod_proxy_fcgi.c:62: warning: 'brb.reserved[0]' is used uninitialized in this function
> mod_proxy_fcgi.c:63: warning: 'brb.reserved[1]' is used uninitialized in this function
> mod_proxy_fcgi.c:64: warning: 'brb.reserved[2]' is used uninitialized in this function
> mod_proxy_fcgi.c:65: warning: 'brb.reserved[3]' is used uninitialized in this function
> mod_proxy_fcgi.c:66: warning: 'brb.reserved[4]' is used uninitialized in this function
Thanks! Should be fixed in r397968.
-garrett
Re: svn commit: r396063 - in /httpd/httpd/trunk: modules/proxy/config.m4 modules/proxy/fcgi_protocol.h modules/proxy/mod_proxy_balancer.c modules/proxy/mod_proxy_fcgi.c support/ support/Makefile.in support/fcgistarter.c
Posted by Joe Orton <jo...@redhat.com>.
On Sat, Apr 22, 2006 at 03:44:07AM -0000, rooneg@apache.org wrote:
> Author: rooneg
> Date: Fri Apr 21 20:44:05 2006
> New Revision: 396063
>
> URL: http://svn.apache.org/viewcvs?rev=396063&view=rev
> Log:
> Merge the fcgi-proxy-dev branch to trunk, adding a FastCGI back end for
> mod_proxy. This log message is just a summary of the changes, for the
> full original log messages see r357431:393955 in branches/fcgi-proxy-dev.
This code has the following gcc (4.1 on x86_64) warnings:
mod_proxy_fcgi.c: In function 'send_environment':
mod_proxy_fcgi.c:269: warning: implicit declaration of function 'ap_add_common_vars'
mod_proxy_fcgi.c:270: warning: implicit declaration of function 'ap_add_cgi_vars'
mod_proxy_fcgi.c: In function 'handle_headers':
mod_proxy_fcgi.c:467: warning: implicit declaration of function 'ap_scan_script_header_err_brigade'
mod_proxy_fcgi.c: In function 'dispatch':
mod_proxy_fcgi.c:677: warning: format '%d' expects type 'int', but argument 7 has type 'apr_size_t'
mod_proxy_fcgi.c: In function 'proxy_fcgi_handler':
mod_proxy_fcgi.c:62: warning: 'brb.reserved[0]' is used uninitialized in this function
mod_proxy_fcgi.c:63: warning: 'brb.reserved[1]' is used uninitialized in this function
mod_proxy_fcgi.c:64: warning: 'brb.reserved[2]' is used uninitialized in this function
mod_proxy_fcgi.c:65: warning: 'brb.reserved[3]' is used uninitialized in this function
mod_proxy_fcgi.c:66: warning: 'brb.reserved[4]' is used uninitialized in this function