Commit f94cfbd1 authored by Ian Holsman's avatar Ian Holsman
Browse files

Allows Mod_proxy to be dynamically loaded on win32 systems 

PR:
Obtained from:
Submitted by:	ianh
Reviewed by:	Chuck Murcko, Graham


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89085 13f79535-47bb-0310-9956-ffa450edef68
parent b5f2396c

modules/proxy/mod_proxy.dsp

+6 −18
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ RSC=rc.exe 
# PROP Ignore_Export_Lib 0

# PROP Target_Dir ""

# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c

# ADD CPP /nologo /MD /W3 /O2 /I "..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\mod_proxy" /FD /c

# ADD CPP /nologo /MD /W3 /O2 /I "..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /I "..\..\include" /I "..\..\os\win32" /I "..\http" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "PROXY_DECLARE_EXPORT" /Fd"Release\mod_proxy" /FD /c

# ADD BASE MTL /nologo /D "NDEBUG" /win32

# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

# ADD BASE RSC /l 0x809 /d "NDEBUG"
@@ -52,8 +52,8 @@ BSC32=bscmake.exe 
# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo

LINK32=link.exe

# ADD BASE LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /map /out:"Release/mod_proxy.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_proxy

# ADD LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /map /out:"Release/mod_proxy.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_proxy

# ADD BASE LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_proxy.so" /base:@..\..\os\win32\BaseAddr.ref,mod_proxy

# ADD LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_proxy.so" /base:@..\..\os\win32\BaseAddr.ref,mod_proxy



!ELSEIF  "$(CFG)" == "mod_proxy - Win32 Debug"
@@ -69,7 +69,7 @@ LINK32=link.exe 
# PROP Ignore_Export_Lib 0

# PROP Target_Dir ""

# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c

# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_proxy" /FD /c

# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /I "..\..\include" /I "..\..\os\win32" /I "..\http" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "PROXY_DECLARE_EXPORT" /Fd"Debug\mod_proxy" /FD /c

# ADD BASE MTL /nologo /D "_DEBUG" /win32

# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

# ADD BASE RSC /l 0x809 /d "_DEBUG"
@@ -78,8 +78,8 @@ BSC32=bscmake.exe 
# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo

LINK32=link.exe

# ADD BASE LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /out:"Debug/mod_proxy.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_proxy

# ADD LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /out:"Debug/mod_proxy.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_proxy

# ADD BASE LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_proxy.so" /base:@..\..\os\win32\BaseAddr.ref,mod_proxy

# ADD LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_proxy.so" /base:@..\..\os\win32\BaseAddr.ref,mod_proxy



!ENDIF
@@ -96,18 +96,6 @@ SOURCE=.\mod_proxy.c 
# End Source File

# Begin Source File



SOURCE=.\proxy_connect.c

# End Source File

# Begin Source File



SOURCE=.\proxy_ftp.c

# End Source File

# Begin Source File



SOURCE=.\proxy_http.c

# End Source File

# Begin Source File



SOURCE=.\proxy_util.c

# End Source File

# End Group

modules/proxy/mod_proxy.h

+21 −21
Original line number Diff line number Diff line
@@ -231,29 +231,29 @@ APR_DECLARE_EXTERNAL_HOOK(proxy, PROXY, int, canon_handler, (request_rec *r, 


/* proxy_util.c */



request_rec *make_fake_req(conn_rec *c, request_rec *r);

int ap_proxy_hex2c(const char *x);

void ap_proxy_c2hex(int ch, char *x);

char *ap_proxy_canonenc(apr_pool_t *p, const char *x, int len, enum enctype t,

PROXY_DECLARE(request_rec *)make_fake_req(conn_rec *c, request_rec *r);

PROXY_DECLARE(int) ap_proxy_hex2c(const char *x);

PROXY_DECLARE(void) ap_proxy_c2hex(int ch, char *x);

PROXY_DECLARE(char *)ap_proxy_canonenc(apr_pool_t *p, const char *x, int len, enum enctype t,

			int isenc);

char *ap_proxy_canon_netloc(apr_pool_t *p, char **const urlp, char **userp,

PROXY_DECLARE(char *)ap_proxy_canon_netloc(apr_pool_t *p, char **const urlp, char **userp,

			 char **passwordp, char **hostp, apr_port_t *port);

const char *ap_proxy_date_canon(apr_pool_t *p, const char *x);

apr_table_t *ap_proxy_read_headers(request_rec *r, request_rec *rp, char *buffer, int size, conn_rec *c);

int ap_proxy_liststr(const char *list, const char *val);

char *ap_proxy_removestr(apr_pool_t *pool, const char *list, const char *val);

int ap_proxy_hex2sec(const char *x);

void ap_proxy_sec2hex(int t, char *y);

const char *ap_proxy_host2addr(const char *host, struct hostent *reqhp);

int ap_proxyerror(request_rec *r, int statuscode, const char *message);

int ap_proxy_is_ipaddr(struct dirconn_entry *This, apr_pool_t *p);

int ap_proxy_is_domainname(struct dirconn_entry *This, apr_pool_t *p);

int ap_proxy_is_hostname(struct dirconn_entry *This, apr_pool_t *p);

int ap_proxy_is_word(struct dirconn_entry *This, apr_pool_t *p);

int ap_proxy_checkproxyblock(request_rec *r, proxy_server_conf *conf, apr_sockaddr_t *uri_addr);

int ap_proxy_pre_http_connection(conn_rec *c, request_rec *r);

apr_status_t ap_proxy_string_read(conn_rec *c, apr_bucket_brigade *bb, char *buff, size_t bufflen, int *eos);

void ap_proxy_reset_output_filters(conn_rec *c);

PROXY_DECLARE(const char *)ap_proxy_date_canon(apr_pool_t *p, const char *x);

PROXY_DECLARE(apr_table_t *)ap_proxy_read_headers(request_rec *r, request_rec *rp, char *buffer, int size, conn_rec *c);

PROXY_DECLARE(int) ap_proxy_liststr(const char *list, const char *val);

PROXY_DECLARE(char *)ap_proxy_removestr(apr_pool_t *pool, const char *list, const char *val);

PROXY_DECLARE(int) ap_proxy_hex2sec(const char *x);

PROXY_DECLARE(void) ap_proxy_sec2hex(int t, char *y);

PROXY_DECLARE(const char *)ap_proxy_host2addr(const char *host, struct hostent *reqhp);

PROXY_DECLARE(int) ap_proxyerror(request_rec *r, int statuscode, const char *message);

PROXY_DECLARE(int) ap_proxy_is_ipaddr(struct dirconn_entry *This, apr_pool_t *p);

PROXY_DECLARE(int) ap_proxy_is_domainname(struct dirconn_entry *This, apr_pool_t *p);

PROXY_DECLARE(int) ap_proxy_is_hostname(struct dirconn_entry *This, apr_pool_t *p);

PROXY_DECLARE(int) ap_proxy_is_word(struct dirconn_entry *This, apr_pool_t *p);

PROXY_DECLARE(int) ap_proxy_checkproxyblock(request_rec *r, proxy_server_conf *conf, apr_sockaddr_t *uri_addr);

PROXY_DECLARE(int) ap_proxy_pre_http_connection(conn_rec *c, request_rec *r);

PROXY_DECLARE(apr_status_t) ap_proxy_string_read(conn_rec *c, apr_bucket_brigade *bb, char *buff, size_t bufflen, int *eos);

PROXY_DECLARE(void) ap_proxy_reset_output_filters(conn_rec *c);





#endif /*MOD_PROXY_H*/

modules/proxy/proxy_connect.c

+4 −4
Original line number Diff line number Diff line
@@ -64,8 +64,8 @@ 


module AP_MODULE_DECLARE_DATA proxy_connect_module;



PROXY_DECLARE (int) ap_proxy_connect_canon(request_rec *r, char *url);

PROXY_DECLARE (int) ap_proxy_connect_handler(request_rec *r, proxy_server_conf *conf, 

int ap_proxy_connect_canon(request_rec *r, char *url);

int ap_proxy_connect_handler(request_rec *r, proxy_server_conf *conf, 

                             char *url, const char *proxyname, 

                             apr_port_t proxyport);
@@ -106,7 +106,7 @@ allowed_port(proxy_server_conf *conf, int port) 
}



/* canonicalise CONNECT URLs. */

PROXY_DECLARE (int) ap_proxy_connect_canon(request_rec *r, char *url)

int ap_proxy_connect_canon(request_rec *r, char *url)

{



    if (r->method_number != M_CONNECT) {
@@ -119,7 +119,7 @@ PROXY_DECLARE (int) ap_proxy_connect_canon(request_rec *r, char *url) 
}



/* CONNECT handler */

PROXY_DECLARE (int) ap_proxy_connect_handler(request_rec *r, proxy_server_conf *conf, 

int ap_proxy_connect_handler(request_rec *r, proxy_server_conf *conf, 

                             char *url, const char *proxyname, 

                             apr_port_t proxyport)

{

modules/proxy/proxy_connect.dsp

0 → 100644
+107 −0
Original line number Diff line number Diff line 
# Microsoft Developer Studio Project File - Name="proxy_connect" - Package Owner=<4>

# Microsoft Developer Studio Generated Build File, Format Version 6.00

# ** DO NOT EDIT **



# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102



CFG=proxy_connect - Win32 Release

!MESSAGE This is not a valid makefile. To build this project using NMAKE,

!MESSAGE use the Export Makefile command and run

!MESSAGE 

!MESSAGE NMAKE /f "proxy_connect.mak".

!MESSAGE 

!MESSAGE You can specify a configuration when running NMAKE

!MESSAGE by defining the macro CFG on the command line. For example:

!MESSAGE 

!MESSAGE NMAKE /f "proxy_connect.mak" CFG="proxy_connect - Win32 Release"

!MESSAGE 

!MESSAGE Possible choices for configuration are:

!MESSAGE 

!MESSAGE "proxy_connect - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

!MESSAGE "proxy_connect - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

!MESSAGE 



# Begin Project

# PROP AllowPerConfigDependencies 0

# PROP Scc_ProjName ""

# PROP Scc_LocalPath ""

CPP=cl.exe

MTL=midl.exe

RSC=rc.exe



!IF  "$(CFG)" == "proxy_connect - Win32 Release"



# PROP BASE Use_MFC 0

# PROP BASE Use_Debug_Libraries 0

# PROP BASE Output_Dir "Release"

# PROP BASE Intermediate_Dir "Release"

# PROP BASE Target_Dir ""

# PROP Use_MFC 0

# PROP Use_Debug_Libraries 0

# PROP Output_Dir "Release"

# PROP Intermediate_Dir "Release"

# PROP Ignore_Export_Lib 0

# PROP Target_Dir ""

# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c

# ADD CPP /nologo /MD /W3 /O2 /I "..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /I "..\..\include" /I "..\..\os\win32" /I "..\http" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\proxy_connect" /FD /c

# ADD BASE MTL /nologo /D "NDEBUG" /win32

# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

# ADD BASE RSC /l 0x809 /d "NDEBUG"

# ADD RSC /l 0x809 /d "NDEBUG"

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo

LINK32=link.exe

# ADD BASE LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/proxy_connect.so" /base:@..\..\os\win32\BaseAddr.ref,proxy_connect

# ADD LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/proxy_connect.so" /base:@..\..\os\win32\BaseAddr.ref,proxy_connect



!ELSEIF  "$(CFG)" == "proxy_connect - Win32 Debug"



# PROP BASE Use_MFC 0

# PROP BASE Use_Debug_Libraries 1

# PROP BASE Output_Dir "Debug"

# PROP BASE Intermediate_Dir "Debug"

# PROP BASE Target_Dir ""

# PROP Use_MFC 0

# PROP Use_Debug_Libraries 1

# PROP Output_Dir "Debug"

# PROP Intermediate_Dir "Debug"

# PROP Ignore_Export_Lib 0

# PROP Target_Dir ""

# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c

# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /I "..\..\include" /I "..\..\os\win32" /I "..\http" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\proxy_connect" /FD /c

# ADD BASE MTL /nologo /D "_DEBUG" /win32

# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

# ADD BASE RSC /l 0x809 /d "_DEBUG"

# ADD RSC /l 0x809 /d "_DEBUG"

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo

LINK32=link.exe

# ADD BASE LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/proxy_connect.so" /base:@..\..\os\win32\BaseAddr.ref,proxy_connect

# ADD LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/proxy_connect.so" /base:@..\..\os\win32\BaseAddr.ref,proxy_connect



!ENDIF 



# Begin Target



# Name "proxy_connect - Win32 Release"

# Name "proxy_connect - Win32 Debug"

# Begin Group "Source Files"



# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

# Begin Source File



SOURCE=.\proxy_connect.c

# End Source File

# End Group

# Begin Group "Header Files"



# PROP Default_Filter ".h"

# Begin Source File



SOURCE=.\mod_proxy.h

# End Source File

# End Group

# End Target

# End Project

modules/proxy/proxy_ftp.c

+6 −6
Original line number Diff line number Diff line
@@ -64,8 +64,8 @@ 


module AP_MODULE_DECLARE_DATA proxy_ftp_module;



PROXY_DECLARE (int) ap_proxy_ftp_canon(request_rec *r, char *url);

PROXY_DECLARE (int) ap_proxy_ftp_handler(request_rec *r, proxy_server_conf *conf, 

int ap_proxy_ftp_canon(request_rec *r, char *url);

int ap_proxy_ftp_handler(request_rec *r, proxy_server_conf *conf, 

                         char *url, const char *proxyhost, 

                         apr_port_t proxyport);

apr_status_t ap_proxy_send_dir_filter(ap_filter_t *f,
@@ -121,7 +121,7 @@ static int ftp_check_string(const char *x) 
/*

 * Canonicalise ftp URLs.

 */

PROXY_DECLARE (int) ap_proxy_ftp_canon(request_rec *r, char *url)

int ap_proxy_ftp_canon(request_rec *r, char *url)

{

    char *user, *password, *host, *path, *parms, *strp, sport[7];

    apr_pool_t *p = r->pool;
@@ -530,7 +530,7 @@ static int ftp_unauthorized (request_rec *r, int log_it) 
 * PASV added by Chuck

 * Filters by [Graham Leggett <minfrin@sharp.fm>]

 */

PROXY_DECLARE (int) ap_proxy_ftp_handler(request_rec *r, proxy_server_conf *conf, 

int ap_proxy_ftp_handler(request_rec *r, proxy_server_conf *conf, 

                         char *url, const char *proxyhost, 

                         apr_port_t proxyport)

{