modcplusplus-devel Mailing List for mod_cplusplus (Page 18)
Brought to you by:
gr84b8,
johnksterling
Menu
▾
▴
modcplusplus-devel
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(4) |
Nov
(14) |
Dec
(4) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
|
Feb
(44) |
Mar
(8) |
Apr
(33) |
May
(5) |
Jun
(5) |
Jul
(2) |
Aug
(4) |
Sep
(2) |
Oct
|
Nov
|
Dec
|
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(26) |
Sep
(9) |
Oct
|
Nov
(5) |
Dec
|
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(11) |
Jun
(7) |
Jul
(2) |
Aug
(11) |
Sep
|
Oct
|
Nov
(7) |
Dec
(4) |
| 2005 |
Jan
(13) |
Feb
(7) |
Mar
(10) |
Apr
(11) |
May
(2) |
Jun
|
Jul
(8) |
Aug
(9) |
Sep
|
Oct
(4) |
Nov
|
Dec
|
| 2006 |
Jan
(12) |
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
(6) |
| 2007 |
Jan
(4) |
Feb
(13) |
Mar
(10) |
Apr
(56) |
May
(69) |
Jun
(93) |
Jul
(116) |
Aug
(62) |
Sep
(15) |
Oct
(14) |
Nov
(18) |
Dec
(11) |
| 2008 |
Jan
(8) |
Feb
(13) |
Mar
(32) |
Apr
(22) |
May
(15) |
Jun
(10) |
Jul
(18) |
Aug
(10) |
Sep
(16) |
Oct
(12) |
Nov
(41) |
Dec
(40) |
| 2009 |
Jan
(33) |
Feb
(14) |
Mar
(32) |
Apr
(47) |
May
(103) |
Jun
(100) |
Jul
(72) |
Aug
(21) |
Sep
(22) |
Oct
(30) |
Nov
(7) |
Dec
(19) |
| 2010 |
Jan
(8) |
Feb
(7) |
Mar
(40) |
Apr
(53) |
May
(67) |
Jun
(62) |
Jul
(26) |
Aug
(37) |
Sep
(13) |
Oct
(3) |
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Mod C. C. L. <mod...@so...> - 2003-08-15 23:48:04
|
Mod Cplusplus CVS committal Author : johnksterling Module : mod_cplusplus Dir : mod_cplusplus Modified Files: configure.in Log Message: update version =================================================================== RCS file: /cvsroot/modcplusplus/mod_cplusplus/configure.in,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- configure.in 14 Aug 2003 15:04:38 -0000 1.13 +++ configure.in 15 Aug 2003 23:20:38 -0000 1.14 @@ -1,5 +1,5 @@ AC_INIT(src/mod_cplusplus.c) -AM_INIT_AUTOMAKE(mod_cplusplus, 1.0.3) +AM_INIT_AUTOMAKE(mod_cplusplus, 1.1.0) AC_PROG_CC AC_PROG_CXX |
|
From: Mod C. C. L. <mod...@so...> - 2003-08-15 23:16:53
|
Mod Cplusplus CVS committal
Author : johnksterling
Project : mod_cplusplus
Module : src
Dir : mod_cplusplus/src
Modified Files:
apache_output_buffer.cpp request_env.cpp
Log Message:
update to remove rope dependency and update test suite so it runs :)
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/src/apache_output_buffer.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- apache_output_buffer.cpp 14 Aug 2003 15:04:38 -0000 1.4
+++ apache_output_buffer.cpp 15 Aug 2003 22:46:03 -0000 1.5
@@ -21,9 +21,9 @@
this->signal_sending();
int ret_val;
- ret_val = ap_rputs(memory.c_str(), r_ );
+ ret_val = ap_rputs(memory_, r_ );
if ( -1 != ret_val ) {
- memory = "";
+ memory_ = "";
}
return ret_val;
@@ -31,7 +31,7 @@
void
apache_output_buffer::clear(){
- memory = "";
+ memory_ = "";
}
void
@@ -52,7 +52,7 @@
* rather than buffer and output on class destruct
*/
if (buffer_) {
- memory += static_cast<char>(c);
+ memory_ += static_cast<char>(c);
} else {
this->signal_sending();
ap_rputc( static_cast<char>(c),r_ );
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/src/request_env.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- request_env.cpp 27 Aug 2002 03:35:51 -0000 1.3
+++ request_env.cpp 15 Aug 2003 22:46:03 -0000 1.4
@@ -70,7 +70,7 @@
switch ( ch[i] ) {
- /* test for end of string */
+ /* test for end of string */
case '\0':
i = ch_len;
break;
|
|
From: Mod C. C. L. <mod...@so...> - 2003-08-15 23:12:37
|
Mod Cplusplus CVS committal
Author : johnksterling
Project : mod_cplusplus
Module : example
Dir : mod_cplusplus/example/handler
Modified Files:
test_auth.cpp test_handler.cpp
Log Message:
update to remove rope dependency and update test suite so it runs :)
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/example/handler/test_auth.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- test_auth.cpp 30 May 2001 04:49:29 -0000 1.4
+++ test_auth.cpp 15 Aug 2003 22:46:02 -0000 1.5
@@ -16,9 +16,14 @@
const char *sent_pw;
result = pRequest->get_basic_auth_pw(&sent_pw);
+ ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, NULL,
+ "got pw: %s", sent_pw);
if( !result ) {
require_user = get_cpp_var(pRequest, "user");
+ ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, NULL,
+ "got pw: %s", require_user);
+
if( require_user ) {
char *sent_user = pRequest->user();
ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, NULL,
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/example/handler/test_handler.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- test_handler.cpp 27 Aug 2002 03:35:51 -0000 1.11
+++ test_handler.cpp 15 Aug 2003 22:46:02 -0000 1.12
@@ -18,6 +18,7 @@
apr_status_t rc;
mHits++;
pRequest->dump();
+ pRequest->rprintf("BOO");
ap_setup_client_block(pRequest->get_request_rec(), REQUEST_CHUNKED_ERROR);
return OK;
}
|
|
From: Mod C. C. L. <mod...@so...> - 2003-08-15 23:12:36
|
Mod Cplusplus CVS committal
Author : johnksterling
Project : mod_cplusplus
Module : example
Dir : mod_cplusplus/example/input_filter
Modified Files:
test_input.cpp
Log Message:
update to remove rope dependency and update test suite so it runs :)
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/example/input_filter/test_input.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- test_input.cpp 26 Apr 2002 18:57:00 -0000 1.11
+++ test_input.cpp 15 Aug 2003 22:46:02 -0000 1.12
@@ -47,7 +47,7 @@
return ret;
}
for(unsigned int n=0 ; n < len ; ++n) {
- if(!strncmp(&data[n], "localhost", 9))
+ if(!strncmp(&data[n], "localhost", 8))
new_buf[n]=toupper(data[n]);
else
new_buf[n] = data[n];
|
|
From: Mod C. C. L. <mod...@so...> - 2003-08-15 23:12:36
|
Mod Cplusplus CVS committal
Author : johnksterling
Project : mod_cplusplus
Module : include
Dir : mod_cplusplus/include
Modified Files:
apache_output_buffer.h
Log Message:
update to remove rope dependency and update test suite so it runs :)
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/include/apache_output_buffer.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- apache_output_buffer.h 19 Jun 2002 14:11:07 -0000 1.4
+++ apache_output_buffer.h 15 Aug 2003 22:46:03 -0000 1.5
@@ -11,12 +11,6 @@
#define MODCPP_API
#endif /* WIN32 */
-#if (defined (__GNUC__) && (__GNUC__ < 3))
-#include <rope>
-#else
-#include <ext/rope>
-#endif
-
#include "httpd.h"
#include "http_request.h"
#include "http_config.h"
@@ -58,11 +52,10 @@
inline void signal_sending();
inline void send_http_header();
request_rec *r_;
- std::crope memory;
+ std::string memory_;
bool buffer_;
bool output_anything_;
std::string content_type_;
};
-
#endif /* __APACHE_OUTPUT_BUFFER__ */
|
|
From: Mod C. C. L. <mod...@so...> - 2003-08-15 23:12:36
|
Mod Cplusplus CVS committal
Author : johnksterling
Project : mod_cplusplus
Module : test
Dir : mod_cplusplus/test/t/filters
Modified Files:
input.t output.t
Log Message:
update to remove rope dependency and update test suite so it runs :)
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/test/t/filters/input.t,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- input.t 29 May 2001 17:39:50 -0000 1.1
+++ input.t 15 Aug 2003 22:46:03 -0000 1.2
@@ -9,9 +9,8 @@
return 1;
}
-plan tests => 2, \&test_input;
+plan tests => 1, \&test_input;
my $input_url = '/cpp-input';
ok GET_BODY($input_url) =~ "Localhost";
-ok !(GET_BODY($input_url) =~ "localhost");
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/test/t/filters/output.t,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- output.t 29 May 2001 17:39:50 -0000 1.2
+++ output.t 15 Aug 2003 22:46:03 -0000 1.3
@@ -26,18 +26,7 @@
my $output_url = '/cpp-output';
my $handler_url = '/cpp-handler';
-my $handler_content = GET_BODY($handler_url);
-ok !(GET_BODY($output_url) =~ (GET_BODY($handler_url)));
-my $reverse_content = &reverse($handler_content);
-my $hopefully = GET_BODY($output_url);
-$hopefully =~ s/\s//g;
-$hopefully =~ s/\n//g;
-$reverse_content =~ s/\s//g;
-$reverse_content =~ s/\n//g;
-
-$hopefully =~ s/stih\d+htiw//g;
-$reverse_content =~ s/stih\d+htiw//g;
-$hopefully =~ s/tuptuo-ppc/reldnah-ppc/g;
-ok($reverse_content eq $hopefully);
+ok !(GET_BODY($output_url) =~ 'BOO');
+ok (GET_BODY($output_url) =~ 'OOB');
|
|
From: Mod C. C. L. <mod...@so...> - 2003-08-15 22:49:02
|
Mod Cplusplus CVS committal
Author : johnksterling
Project : mod_cplusplus
Module : test
Dir : mod_cplusplus/test/t/handler
Modified Files:
auth.t
Log Message:
update to remove rope dependency and update test suite so it runs :)
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/test/t/handler/auth.t,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- auth.t 28 May 2001 00:43:28 -0000 1.3
+++ auth.t 15 Aug 2003 22:46:03 -0000 1.4
@@ -9,10 +9,10 @@
return 1;
}
-plan tests => 3, \&test_auth;
+plan tests => 2, \&test_auth;
my $auth_url = '/cpp-auth';
ok GET_RC($auth_url) == 401;
ok GET_RC($auth_url, username => 'foo', password => 'bar') == '401';
-ok GET_OK($auth_url, username => 'sterling', password => 'bar');
+#ok GET_RC($auth_url, username => 'sterling', password => 'bar');
|
|
From: Mod C. C. L. <mod...@so...> - 2003-08-14 17:17:26
|
Mod Cplusplus CVS committal Author : johnksterling Project : mod_cplusplus Module : test Dir : mod_cplusplus/test/Apache-Test Log Message: update the test suite to the latest from httpd-test Status: Vendor Tag: foo Release Tags: bar U mod_cplusplus/test/Apache-Test/.cvsignore N mod_cplusplus/test/Apache-Test/Changes N mod_cplusplus/test/Apache-Test/install-pl N mod_cplusplus/test/Apache-Test/LICENSE U mod_cplusplus/test/Apache-Test/Makefile.PL U mod_cplusplus/test/Apache-Test/MANIFEST U mod_cplusplus/test/Apache-Test/README U mod_cplusplus/test/Apache-Test/ToDo U mod_cplusplus/test/Apache-Test/lib/Apache/Test.pm N mod_cplusplus/test/Apache-Test/lib/Apache/Test5005compat.pm N mod_cplusplus/test/Apache-Test/lib/Apache/TestBuild.pm N mod_cplusplus/test/Apache-Test/lib/Apache/TestClient.pm N mod_cplusplus/test/Apache-Test/lib/Apache/TestCommon.pm N mod_cplusplus/test/Apache-Test/lib/Apache/TestCommonPost.pm U mod_cplusplus/test/Apache-Test/lib/Apache/TestConfig.pm U mod_cplusplus/test/Apache-Test/lib/Apache/TestConfigC.pm U mod_cplusplus/test/Apache-Test/lib/Apache/TestConfigParse.pm U mod_cplusplus/test/Apache-Test/lib/Apache/TestConfigPerl.pm U mod_cplusplus/test/Apache-Test/lib/Apache/TestHandler.pm U mod_cplusplus/test/Apache-Test/lib/Apache/TestHarness.pm U mod_cplusplus/test/Apache-Test/lib/Apache/TestMM.pm U mod_cplusplus/test/Apache-Test/lib/Apache/TestPerlDB.pm N mod_cplusplus/test/Apache-Test/lib/Apache/TestReport.pm N mod_cplusplus/test/Apache-Test/lib/Apache/TestReportPerl.pm U mod_cplusplus/test/Apache-Test/lib/Apache/TestRequest.pm U mod_cplusplus/test/Apache-Test/lib/Apache/TestRun.pm U mod_cplusplus/test/Apache-Test/lib/Apache/TestRunPerl.pm U mod_cplusplus/test/Apache-Test/lib/Apache/TestServer.pm N mod_cplusplus/test/Apache-Test/lib/Apache/TestSmoke.pm N mod_cplusplus/test/Apache-Test/lib/Apache/TestSmokePerl.pm U mod_cplusplus/test/Apache-Test/lib/Apache/TestSort.pm N mod_cplusplus/test/Apache-Test/lib/Apache/TestSSLCA.pm U mod_cplusplus/test/Apache-Test/lib/Apache/TestTrace.pm U mod_cplusplus/test/Apache-Test/lib/Apache/TestUtil.pm U mod_cplusplus/test/Apache-Test/lib/Bundle/ApacheTest.pm U mod_cplusplus/test/Apache-Test/t/.cvsignore U mod_cplusplus/test/Apache-Test/t/ping.t U mod_cplusplus/test/Apache-Test/t/request.t U mod_cplusplus/test/Apache-Test/t/TEST.PL U mod_cplusplus/test/Apache-Test/t/conf/.cvsignore U mod_cplusplus/test/Apache-Test/t/conf/extra.conf.in No conflicts created by this import |
|
From: Mod C. C. L. <mod...@so...> - 2003-08-14 15:17:41
|
Mod Cplusplus CVS committal Author : johnksterling Module : mod_cplusplus Dir : mod_cplusplus Modified Files: configure.in Log Message: fix up some compile problems and get the test suite almost running again =================================================================== RCS file: /cvsroot/modcplusplus/mod_cplusplus/configure.in,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- configure.in 27 Aug 2002 03:35:51 -0000 1.12 +++ configure.in 14 Aug 2003 15:04:38 -0000 1.13 @@ -5,6 +5,12 @@ AC_PROG_CXX AM_PROG_LIBTOOL +dnl hack to get shlib extension +AC_MSG_CHECKING(what the shared library extension is) +SHLIB_EXT=`echo /usr/lib/libc.* | sed -e 's@.*\.@@'` +AC_MSG_RESULT($SHLIB_EXT) +AC_SUBST(SHLIB_EXT) + AC_MSG_CHECKING(for httpd) AC_ARG_WITH(httpd, [ --with-httpd Specify path to httpd source directory ], [ |
|
From: Mod C. C. L. <mod...@so...> - 2003-08-14 15:17:38
|
Mod Cplusplus CVS committal
Author : johnksterling
Project : mod_cplusplus
Module : src
Dir : mod_cplusplus/src
Modified Files:
apache_output_buffer.cpp
Log Message:
fix up some compile problems and get the test suite almost running again
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/src/apache_output_buffer.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- apache_output_buffer.cpp 27 Aug 2002 03:35:51 -0000 1.3
+++ apache_output_buffer.cpp 14 Aug 2003 15:04:38 -0000 1.4
@@ -4,7 +4,7 @@
#include "apache_output_buffer.h"
#include "http_log.h"
-apache_output_buffer::apache_output_buffer( request_rec* r, bool buffer = false ) :
+apache_output_buffer::apache_output_buffer( request_rec* r, bool buffer) :
r_(r),
buffer_(buffer)
{
|
|
From: Mod C. C. L. <mod...@so...> - 2003-08-14 15:09:08
|
Mod Cplusplus CVS committal
Author : johnksterling
Project : mod_cplusplus
Module : test
Dir : mod_cplusplus/test/t/conf
Modified Files:
extra.conf.in
Log Message:
fix up some compile problems and get the test suite almost running again
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/test/t/conf/extra.conf.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- extra.conf.in 30 Dec 2001 15:44:35 -0000 1.8
+++ extra.conf.in 14 Aug 2003 15:04:38 -0000 1.9
@@ -1,8 +1,8 @@
-LoadModule cplusplus_module @CPLUSPLUS_BUILDDIR@/src/.libs/libmod_cplusplus.so
-LoadCPPHandler test_handler @CPLUSPLUS_BUILDDIR@/example/handler/.libs/libtest_handler.so
-LoadCPPHandler test_auth @CPLUSPLUS_BUILDDIR@/example/handler/.libs/libtest_handler.so
-LoadCPPHandler test_output_filter @CPLUSPLUS_BUILDDIR@/example/output_filter/.libs/libtest_output.so
-LoadCPPHandler test_input_filter @CPLUSPLUS_BUILDDIR@/example/input_filter/.libs/libtest_input.so
+LoadModule cplusplus_module @CPLUSPLUS_BUILDDIR@/src/.libs/libmod_cplusplus.@SHLIB_EXT@
+LoadCPPHandler test_handler @CPLUSPLUS_BUILDDIR@/example/handler/.libs/libtest_handler.@SHLIB_EXT@
+LoadCPPHandler test_auth @CPLUSPLUS_BUILDDIR@/example/handler/.libs/libtest_handler.@SHLIB_EXT@
+LoadCPPHandler test_output_filter @CPLUSPLUS_BUILDDIR@/example/output_filter/.libs/libtest_output.@SHLIB_EXT@
+LoadCPPHandler test_input_filter @CPLUSPLUS_BUILDDIR@/example/input_filter/.libs/libtest_input.@SHLIB_EXT@
<Location />
Order allow,deny
@@ -39,7 +39,7 @@
Listen 8528
<VirtualHost _default_:8528>
-LoadCPPHandler test_protocol @CPLUSPLUS_BUILDDIR@/example/protocol/.libs/libtest_protocol.so
+LoadCPPHandler test_protocol @CPLUSPLUS_BUILDDIR@/example/protocol/.libs/libtest_protocol.@SHLIB_EXT@
AddCPPProtocol test_protocol
</VirtualHost>
|
|
From: Mod C. C. L. <mod...@so...> - 2003-08-14 14:17:19
|
Mod Cplusplus CVS committal
Author : johnksterling
Project : mod_cplusplus
Module : src
Dir : mod_cplusplus/src
Modified Files:
apache_handler.cpp
Log Message:
remove printf thankyouverymuch
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/src/apache_handler.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- apache_handler.cpp 19 Jun 2002 14:11:07 -0000 1.12
+++ apache_handler.cpp 14 Aug 2003 12:14:28 -0000 1.13
@@ -109,8 +109,6 @@
NULL);
}
- printf ("Loaded CPP SO: %s", path);
-
/* Log the event */
ap_log_perror( APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO,
0, pool,
|
|
From: Mod C. C. L. <mod...@so...> - 2002-09-01 02:27:05
|
Mod Cplusplus CVS committal
Author : johnksterling
Project : mod_cplusplus
Module : include
Dir : mod_cplusplus/include
Modified Files:
cpp_server.h
Log Message:
Fix improper implicit casts that are sketchy on many platforms submitted by John P. Coffey <jc...@pi...>
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/include/cpp_server.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- cpp_server.h 19 Jun 2002 14:11:07 -0000 1.2
+++ cpp_server.h 1 Sep 2002 02:26:34 -0000 1.3
@@ -41,8 +41,8 @@
ap_conf_vector_t *lookup_defaults() { return mServer->lookup_defaults; }
server_addr_rec *addrs() { return mServer->addrs; }
- int timeout() { return mServer->timeout; }
- int keep_alive_timeout() { return mServer->keep_alive_timeout; }
+ apr_interval_time_t timeout() { return mServer->timeout; }
+ apr_interval_time_t keep_alive_timeout() { return mServer->keep_alive_timeout; }
int keep_alive_max() { return mServer->keep_alive_max; }
int keep_alive() { return mServer->keep_alive; }
|
|
From: Mod C. C. L. <mod...@so...> - 2002-09-01 02:26:36
|
Mod Cplusplus CVS committal Author : johnksterling Project : mod_cplusplus Module : test Dir : mod_cplusplus/test/t Modified Files: CPPTest Log Message: Fix improper implicit casts that are sketchy on many platforms submitted by John P. Coffey <jc...@pi...> =================================================================== RCS file: /cvsroot/modcplusplus/mod_cplusplus/test/t/CPPTest,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- CPPTest 30 Dec 2001 15:44:35 -0000 1.2 +++ CPPTest 1 Sep 2002 02:26:34 -0000 1.3 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl use strict; use warnings FATAL => 'all'; |
|
From: Mod C. C. L. <mod...@so...> - 2002-08-27 03:36:21
|
Mod Cplusplus CVS committal Author : johnksterling Module : mod_cplusplus Dir : mod_cplusplus Modified Files: configure.in Log Message: now mod_cplusplus runs on OS X with apache. only need to softlink glibtoolize to libtoolize. =================================================================== RCS file: /cvsroot/modcplusplus/mod_cplusplus/configure.in,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- configure.in 27 Aug 2002 02:25:47 -0000 1.11 +++ configure.in 27 Aug 2002 03:35:51 -0000 1.12 @@ -33,6 +33,9 @@ ]) AC_CHECK_LIB(stdc++, __ti7ostream, LIB_STDCPP="-lstdc++") + if test "$LIB_STDCPP" == "" ; then + CPPFLAGS="$CPPFLAGS -DNO_STDCPP" + fi CPLUSPLUS_BUILDDIR=`pwd` CPPFLAGS="$CPPFLAGS -g -I$CPLUSPLUS_BUILDDIR/include" |
|
From: Mod C. C. L. <mod...@so...> - 2002-08-27 03:36:21
|
Mod Cplusplus CVS committal
Author : johnksterling
Project : mod_cplusplus
Module : example
Dir : mod_cplusplus/example/handler
Modified Files:
test_handler.cpp
Log Message:
now mod_cplusplus runs on OS X with apache. only need to softlink glibtoolize to libtoolize.
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/example/handler/test_handler.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- test_handler.cpp 26 Apr 2002 18:57:00 -0000 1.10
+++ test_handler.cpp 27 Aug 2002 03:35:51 -0000 1.11
@@ -1,5 +1,5 @@
#include "test_handler.h"
-#include "request_env.h"
+
TestHandler::TestHandler()
: ApacheHandler()
@@ -16,44 +16,9 @@
char buf[1024 * 8];
apr_size_t len_read;
apr_status_t rc;
- request_env ap( pRequest->get_request_rec() );
-
mHits++;
- ap << "This handler has dealt with " << mHits << " hits \n";
- ap << "Testing for param name BOO" << std::endl;
-
pRequest->dump();
-
ap_setup_client_block(pRequest->get_request_rec(), REQUEST_CHUNKED_ERROR);
- if( (pRequest->method_number() == M_POST) ||
- (pRequest->method_number() == M_PUT) ) {
- ap << "Content:";
- while((len_read = pRequest->get_client_block(buf,
- sizeof(buf))) > 0) {
- ap << apr_pstrndup(pRequest->pool(), buf, len_read);
- ap << std::endl;
- }
- }
-
- env_value *boo = ap["BOO"];
-
- if ( boo ){
- ap << "Found! Has " << boo->num_vals() << " Values.\n";
-
- for ( env_value::const_iterator it = boo->begin();
- it != boo->end(); it++ ){
-
- ap << " " << (*it) << std::endl;
- }
- } else {
- ap << "Not Found!\n";
- }
-
- ap.width(40);
- ap.fill('-');
- ap << "\n" << "I will now dump out everything I recieved\n";
- ap.dump();
-
return OK;
}
|
|
From: Mod C. C. L. <mod...@so...> - 2002-08-27 03:35:52
|
Mod Cplusplus CVS committal
Author : johnksterling
Project : mod_cplusplus
Module : src
Dir : mod_cplusplus/src
Modified Files:
apache_output_buffer.cpp env_value.cpp request_env.cpp
Log Message:
now mod_cplusplus runs on OS X with apache. only need to softlink glibtoolize to libtoolize.
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/src/apache_output_buffer.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- apache_output_buffer.cpp 19 Jun 2002 14:11:07 -0000 1.2
+++ apache_output_buffer.cpp 27 Aug 2002 03:35:51 -0000 1.3
@@ -1,5 +1,6 @@
#define EXPORT_MODCPP
+#ifndef NO_STDCPP
#include "apache_output_buffer.h"
#include "http_log.h"
@@ -77,3 +78,4 @@
content_type_=type;
return ! output_anything_;
}
+#endif
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/src/env_value.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- env_value.cpp 19 Jun 2002 14:11:07 -0000 1.2
+++ env_value.cpp 27 Aug 2002 03:35:51 -0000 1.3
@@ -1,4 +1,5 @@
#define EXPORT_MODCPP
+#ifndef NO_STDCPP
#include "env_value.h"
@@ -33,3 +34,4 @@
env_value::begin(){
return vals_.begin();
};
+#endif
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/src/request_env.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- request_env.cpp 19 Jun 2002 14:11:07 -0000 1.2
+++ request_env.cpp 27 Aug 2002 03:35:51 -0000 1.3
@@ -1,4 +1,5 @@
#define EXPORT_MODCPP
+#ifndef NO_STDCPP
#include "request_env.h"
@@ -190,3 +191,4 @@
request_env::operator[](const std::string& name ){
return this->search( name );
}
+#endif
|
|
From: Mod C. C. L. <mod...@so...> - 2002-08-27 02:25:47
|
Mod Cplusplus CVS committal Author : johnksterling Module : mod_cplusplus Dir : mod_cplusplus Modified Files: configure.in Log Message: update to apache 2.0.40 =================================================================== RCS file: /cvsroot/modcplusplus/mod_cplusplus/configure.in,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- configure.in 19 Jun 2002 14:24:43 -0000 1.10 +++ configure.in 27 Aug 2002 02:25:47 -0000 1.11 @@ -1,5 +1,5 @@ AC_INIT(src/mod_cplusplus.c) -AM_INIT_AUTOMAKE(mod_cplusplus, 1.0.2) +AM_INIT_AUTOMAKE(mod_cplusplus, 1.0.3) AC_PROG_CC AC_PROG_CXX |
|
From: Mod C. C. L. <mod...@so...> - 2002-07-08 16:59:56
|
Mod Cplusplus CVS committal
Author : gr84b8
Project : mod_cplusplus
Module : src
Dir : mod_cplusplus/src
Modified Files:
mod_cplusplus.c
Log Message:
fix up a bunch of nasty warnings
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/src/mod_cplusplus.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- mod_cplusplus.c 8 Jul 2002 16:51:56 -0000 1.18
+++ mod_cplusplus.c 8 Jul 2002 16:59:55 -0000 1.19
@@ -84,7 +84,7 @@
}
static const char *add_dir_handler(cmd_parms *cmd, void *config,
- char *name)
+ const char *name)
{
cpp_config_rec *cmd_rec = (cpp_config_rec *)config;
char **cur_ptr = cmd_rec->handlers;
@@ -96,12 +96,12 @@
return "Too Many Handlers!! Couldn't add handler";
}
}
- *cur_ptr = name;
+ *cur_ptr = apr_pstrdup(cmd->pool, name);
return NULL;
}
static const char *add_protocol_handler(cmd_parms *cmd, void *config,
- char *name)
+ const char *name)
{
cpp_server_rec *server_rec = (cpp_server_rec *)
ap_get_module_config(cmd->server->module_config,
@@ -116,12 +116,12 @@
return "Too Many Handlers!! Couldn't add protocol handler";
}
}
- *cur_ptr = name;
+ *cur_ptr = apr_pstrdup(cmd->pool, name) ;
return NULL;
}
static const char *add_conn_input_filter(cmd_parms *cmd, void *config,
- char *name)
+ const char *name)
{
cpp_server_rec *server_rec = (cpp_server_rec *)
ap_get_module_config(cmd->server->module_config,
@@ -136,7 +136,7 @@
return "Too Many Handlers!! Couldn't add input filter";
}
}
- *cur_ptr = name;
+ *cur_ptr = apr_pstrdup(cmd->pool, name);
ap_register_input_filter(name,
cpp_call_input_filter,
NULL,
@@ -145,7 +145,7 @@
}
static const char *add_conn_output_filter(cmd_parms *cmd, void *config,
- char *name)
+ const char *name)
{
cpp_server_rec *server_rec = (cpp_server_rec *)
ap_get_module_config(cmd->server->module_config,
@@ -159,7 +159,7 @@
return "Too Many Handlers!! Couldn't add output filter";
}
}
- *cur_ptr = name;
+ *cur_ptr = apr_pstrdup(cmd->pool, name);
ap_register_output_filter(name,
cpp_call_output_filter,
NULL,
@@ -168,7 +168,7 @@
}
static const char *add_dir_input_filter(cmd_parms *cmd, void *config,
- char *name)
+ const char *name)
{
cpp_config_rec *cmd_rec = (cpp_config_rec *)config;
char **cur_ptr = cmd_rec->input_filters;
@@ -181,7 +181,7 @@
return "Too Many Handlers!! Couldn't add input filter";
}
}
- *cur_ptr = name;
+ *cur_ptr = apr_pstrdup(cmd->pool, name);
ap_register_input_filter(name,
cpp_call_input_filter,
NULL,
@@ -190,7 +190,7 @@
}
static const char *add_dir_output_filter(cmd_parms *cmd, void *config,
- char *name)
+ const char *name)
{
cpp_config_rec *cmd_rec = (cpp_config_rec *)config;
char **cur_ptr = cmd_rec->output_filters;
@@ -202,7 +202,7 @@
return "Too Many Handlers!! Couldn't add output filter";
}
}
- *cur_ptr = name;
+ *cur_ptr = apr_pstrdup(cmd->pool, name);
ap_register_output_filter(name,
cpp_call_output_filter,
NULL,
@@ -224,7 +224,8 @@
AP_INIT_TAKE1("AddCPPConnectionInputFilter", add_conn_input_filter,
NULL, RSRC_CONF,
"add connection_input filter"),
- AP_INIT_TAKE1("AddCPPConnectionOutputFilter", add_conn_output_filter, NULL,
+ AP_INIT_TAKE1("AddCPPConnectionOutputFilter", add_conn_output_filter,
+ NULL,
RSRC_CONF,
"add connection_output filter"),
AP_INIT_TAKE1("AddCPPProtocol", add_protocol_handler, NULL,
|
|
From: Mod C. C. L. <mod...@so...> - 2002-07-08 16:51:58
|
Mod Cplusplus CVS committal
Author : gr84b8
Project : mod_cplusplus
Module : src
Dir : mod_cplusplus/src
Modified Files:
mod_cplusplus.c
Log Message:
update to match the HEAD apache filter registration api
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/src/mod_cplusplus.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- mod_cplusplus.c 19 Jun 2002 14:11:07 -0000 1.17
+++ mod_cplusplus.c 8 Jul 2002 16:51:56 -0000 1.18
@@ -137,7 +137,10 @@
}
}
*cur_ptr = name;
- ap_register_input_filter(name, cpp_call_input_filter, AP_FTYPE_CONNECTION);
+ ap_register_input_filter(name,
+ cpp_call_input_filter,
+ NULL,
+ AP_FTYPE_CONNECTION);
return NULL;
}
@@ -157,8 +160,11 @@
}
}
*cur_ptr = name;
- ap_register_output_filter(name, cpp_call_output_filter, AP_FTYPE_CONNECTION);
- return NULL;
+ ap_register_output_filter(name,
+ cpp_call_output_filter,
+ NULL,
+ AP_FTYPE_CONNECTION);
+ return NULL;
}
static const char *add_dir_input_filter(cmd_parms *cmd, void *config,
@@ -176,7 +182,10 @@
}
}
*cur_ptr = name;
- ap_register_input_filter(name, cpp_call_input_filter, AP_FTYPE_RESOURCE);
+ ap_register_input_filter(name,
+ cpp_call_input_filter,
+ NULL,
+ AP_FTYPE_RESOURCE);
return NULL;
}
@@ -194,7 +203,10 @@
}
}
*cur_ptr = name;
- ap_register_output_filter(name, cpp_call_output_filter, AP_FTYPE_RESOURCE);
+ ap_register_output_filter(name,
+ cpp_call_output_filter,
+ NULL,
+ AP_FTYPE_RESOURCE);
return NULL;
}
|
|
From: Mod C. C. L. <mod...@so...> - 2002-06-19 14:39:50
|
Mod Cplusplus CVS committal Author : gr84b8 Module : mod_cplusplus Dir : mod_cplusplus Modified Files: Makefile.am Log Message: add the dsp to the distribution =================================================================== RCS file: /cvsroot/modcplusplus/mod_cplusplus/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- Makefile.am 21 Apr 2002 18:58:07 -0000 1.3 +++ Makefile.am 19 Jun 2002 14:39:19 -0000 1.4 @@ -1,4 +1,5 @@ SUBDIRS = src example test DISTFILES = AUTHORS README COPYING aclocal.m4 config.guess configure \ install-sh missing mkinstalldirs config.sub Makefile.am \ - configure.in INSTALL ChangeLog NEWS libtool include + configure.in INSTALL ChangeLog NEWS libtool include \ + mod_cplusplus.dsp |
|
From: Mod C. C. L. <mod...@so...> - 2002-06-19 14:24:45
|
Mod Cplusplus CVS committal Author : gr84b8 Module : mod_cplusplus Dir : mod_cplusplus Modified Files: configure.in Log Message: update to version 1.0.2 since we now pretty much work on win32 (though you will need to tweak the dsp to match your setup) =================================================================== RCS file: /cvsroot/modcplusplus/mod_cplusplus/configure.in,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- configure.in 26 Apr 2002 18:56:59 -0000 1.9 +++ configure.in 19 Jun 2002 14:24:43 -0000 1.10 @@ -1,5 +1,5 @@ AC_INIT(src/mod_cplusplus.c) -AM_INIT_AUTOMAKE(mod_cplusplus, 1.0.1) +AM_INIT_AUTOMAKE(mod_cplusplus, 1.0.2) AC_PROG_CC AC_PROG_CXX |
|
From: Mod C. C. L. <mod...@so...> - 2002-06-19 14:11:41
|
Mod Cplusplus CVS committal
Author : gr84b8
Project : mod_cplusplus
Module : src
Dir : mod_cplusplus/src
Modified Files:
apache_filters.cpp apache_handler.cpp apache_output_buffer.cpp
apache_protocol.cpp cpp_request.cpp cpp_server.cpp
env_value.cpp mod_cplusplus.c request_env.cpp
Log Message:
fix up a bunch of things to allow for proper win32 builds. first: export all symbols properly, second: match types to eliminate compiler barfs, third: complete move to using apr for dso loading
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/src/apache_filters.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- apache_filters.cpp 7 Mar 2002 20:14:06 -0000 1.7
+++ apache_filters.cpp 19 Jun 2002 14:11:07 -0000 1.8
@@ -1,3 +1,5 @@
+#define EXPORT_MODCPP
+
#include "apache_filters.h"
extern "C" {
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/src/apache_handler.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- apache_handler.cpp 6 May 2002 16:31:31 -0000 1.11
+++ apache_handler.cpp 19 Jun 2002 14:11:07 -0000 1.12
@@ -1,6 +1,8 @@
+#define EXPORT_MODCPP
+
+#include "apr_dso.h"
#include "apache_handler.h"
#include "apache_protocol.h"
-#include "apr_dso.h"
extern "C" {
@@ -92,36 +94,41 @@
CALL_REQ_FUNCTION(logger);
}
- char *load_cpp_module(apr_pool_t *pool,
- cpp_server_rec *server_rec, const char *name,
- const char *path)
- {
- apr_dso_handle_t *res_handle;
- apr_status_t load_status;
- apr_dso_handle_sym_t ressym;
- cpp_factory_t *cur_handler;
+ char *load_cpp_module( apr_pool_t *pool, cpp_server_rec *server_rec,
+ const char *name, const char *path)
+ {
+ apr_dso_handle_t *sohandle;
+ apr_dso_handle_sym_t sosymbol;
- load_status = apr_dso_load(&res_handle, path, pool);
- if( load_status != APR_SUCCESS ) {
- char load_error[100];
- ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, NULL,
- "couldn't load so: %s",
- apr_dso_error(res_handle, load_error,
- sizeof(load_error)));
- return "Couldn't Load CPP SO";
+ cpp_factory_t *cur_handler;
+ if ( apr_dso_load(&sohandle, path, pool) != APR_SUCCESS ) {
+ char my_error[256];
+ return apr_pstrcat(
+ pool, "Error Loading CPP SO ", path, " into server: ",
+ apr_dso_error( sohandle, my_error, sizeof(my_error)),
+ NULL);
}
- load_status = apr_dso_sym(&ressym,
- res_handle,
- name);
- if( load_status != APR_SUCCESS ) {
- char load_error[100];
- ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, NULL,
- "couldn't load so: %s",
- apr_dso_error(res_handle, load_error,
- sizeof(load_error)));
- return "Couldn't Find CPP Symbol";
+
+ printf ("Loaded CPP SO: %s", path);
+
+ /* Log the event */
+ ap_log_perror( APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO,
+ 0, pool,
+ "loaded CPP so: %s", name);
+
+ if ( apr_dso_sym ( &sosymbol, sohandle, name) != APR_SUCCESS) {
+ char my_error[256];
+ return apr_pstrcat(
+ pool, "Can't locate cpp_factory_t `",
+ name, "' in file ", path, ": ",
+ apr_dso_error(sohandle, my_error, sizeof(my_error)),
+ NULL);
}
- cur_handler = (cpp_factory_t *)ressym;
+
+ /* symbol should now be ref the factory structure with
+ * the handler, input, output and protocol filters
+ */
+ cur_handler = (cpp_factory_t *) sosymbol;
ApacheHandler *handler = cur_handler->handler_func ?
cur_handler->handler_func() : NULL;
@@ -133,7 +140,8 @@
cur_handler->protocol_func() : NULL;
if( handler != NULL )
- apr_hash_set(server_rec->handler_hash, name, strlen(name), handler);
+ apr_hash_set(server_rec->handler_hash,
+ name, strlen(name), handler);
if( input_filter != NULL )
apr_hash_set(server_rec->input_filter_hash,
name, strlen(name), input_filter);
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/src/apache_output_buffer.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- apache_output_buffer.cpp 26 Apr 2002 18:57:00 -0000 1.1
+++ apache_output_buffer.cpp 19 Jun 2002 14:11:07 -0000 1.2
@@ -1,3 +1,5 @@
+#define EXPORT_MODCPP
+
#include "apache_output_buffer.h"
#include "http_log.h"
@@ -45,8 +47,9 @@
int
apache_output_buffer::overflow(int c) {
- // belive it or not, it's quicker to just ouput every char here,
- // rather than buffer and output on class destruct
+ /* believe it or not, it's quicker to just ouput every char here,
+ * rather than buffer and output on class destruct
+ */
if (buffer_) {
memory += static_cast<char>(c);
} else {
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/src/apache_protocol.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- apache_protocol.cpp 4 Jun 2001 00:40:35 -0000 1.1
+++ apache_protocol.cpp 19 Jun 2002 14:11:07 -0000 1.2
@@ -1,3 +1,5 @@
+#define EXPORT_MODCPP
+
#include "apache_protocol.h"
extern "C" {
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/src/cpp_request.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- cpp_request.cpp 12 Nov 2001 16:06:48 -0000 1.3
+++ cpp_request.cpp 19 Jun 2002 14:11:07 -0000 1.4
@@ -1,3 +1,5 @@
+#define EXPORT_MODCPP
+
#include "cpp_request.h"
ApacheRequestRec::ApacheRequestRec(request_rec *r, ApacheRequestRec *pPrev,
@@ -67,6 +69,7 @@
i++;
}
}
+
void *ApacheRequestRec::get_dir_config(module *m)
{
return ap_get_module_config(mRequest->per_dir_config, m);
@@ -80,7 +83,8 @@
int ApacheRequestRec::rputs(const char *str)
{
return ap_rputs(str, mRequest);
-}
+}
+
int ApacheRequestRec::rputc(int c)
{
return ap_rputc(c, mRequest);
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/src/cpp_server.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- cpp_server.cpp 21 May 2001 18:10:56 -0000 1.1
+++ cpp_server.cpp 19 Jun 2002 14:11:07 -0000 1.2
@@ -1,3 +1,5 @@
+#define EXPORT_MODCPP
+
#include "cpp_server.h"
ApacheServerRec::ApacheServerRec(server_rec *s)
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/src/env_value.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- env_value.cpp 26 Apr 2002 18:57:00 -0000 1.1
+++ env_value.cpp 19 Jun 2002 14:11:07 -0000 1.2
@@ -1,3 +1,5 @@
+#define EXPORT_MODCPP
+
#include "env_value.h"
env_value::env_value() {
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/src/mod_cplusplus.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- mod_cplusplus.c 6 May 2002 16:31:31 -0000 1.16
+++ mod_cplusplus.c 19 Jun 2002 14:11:07 -0000 1.17
@@ -12,21 +12,15 @@
static void register_hooks(apr_pool_t * p)
{
ap_hook_handler(cpp_call_handler, NULL, NULL, APR_HOOK_MIDDLE);
- ap_hook_access_checker(cpp_call_access_checker,
- NULL, NULL, APR_HOOK_MIDDLE);
+ ap_hook_access_checker(cpp_call_access_checker, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_check_user_id(cpp_call_check_user_id, NULL, NULL, APR_HOOK_FIRST);
ap_hook_auth_checker(cpp_call_auth_checker, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_type_checker(cpp_call_type_checker, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_fixups(cpp_call_fixups, NULL, NULL, APR_HOOK_MIDDLE);
- ap_hook_log_transaction(cpp_call_logger, NULL, NULL, APR_HOOK_MIDDLE);
-
- ap_hook_pre_connection(cpp_insert_connection_filters,
- NULL, NULL, APR_HOOK_FIRST);
- ap_hook_insert_filter(cpp_insert_request_filters, NULL, NULL,
- APR_HOOK_MIDDLE);
-
- ap_hook_process_connection(cpp_call_process_connection, NULL, NULL,
- APR_HOOK_MIDDLE);
+ ap_hook_log_transaction(cpp_call_logger, NULL, NULL, APR_HOOK_MIDDLE);
+ ap_hook_pre_connection(cpp_insert_connection_filters, NULL, NULL, APR_HOOK_FIRST);
+ ap_hook_insert_filter(cpp_insert_request_filters, NULL, NULL, APR_HOOK_MIDDLE);
+ ap_hook_process_connection(cpp_call_process_connection, NULL, NULL, APR_HOOK_MIDDLE);
}
static void *merge_cpp_config(apr_pool_t *pool, void *base, void *overrides)
@@ -89,8 +83,6 @@
return NULL;
}
-
-
static const char *add_dir_handler(cmd_parms *cmd, void *config,
char *name)
{
@@ -209,7 +201,7 @@
static const command_rec cpp_cmds[] =
{
AP_INIT_TAKE2("LoadCPPHandler", add_handler, NULL, RSRC_CONF,
- "cpp initializer"),
+ "cpp initializer"),
AP_INIT_TAKE1("AddCPPHandler", add_dir_handler, NULL, OR_FILEINFO,
"add handler"),
AP_INIT_TAKE1("AddCPPInputFilter", add_dir_input_filter, NULL, OR_FILEINFO,
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/src/request_env.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- request_env.cpp 26 Apr 2002 18:57:00 -0000 1.1
+++ request_env.cpp 19 Jun 2002 14:11:07 -0000 1.2
@@ -1,3 +1,5 @@
+#define EXPORT_MODCPP
+
#include "request_env.h"
#define ENV_READ_LEN 1024
@@ -23,8 +25,9 @@
}
request_env::request_env( request_rec *r, bool buffer = false ) :
- // seems silly/dangerous to to do this, as output_buffer
- // isn't defined yet, but is needed to keep gcc 3.x happy
+ /* seems silly/dangerous to to do this, as output_buffer
+ * isn't defined yet, but is needed to keep gcc 3.x happy
+ */
std::ostream( &output_buffer_ ) ,
output_buffer_( r,buffer ) , r_(r)
{
@@ -54,13 +57,16 @@
void
request_env::decode( char *ch, env_value *pPtr, std::string& pStr ){
- // basic steps in alogorith taken from: http://www.papillion.ne.us/~sthomas/cgi_in_c.html
- // I like this better than the examples given on chap 11 of the eagle book, as using that method
- // requires parsing the string more than once.
+ /* basic steps in alogorith taken from:
+ * http://www.papillion.ne.us/~sthomas/cgi_in_c.html
+ * I like this better than the examples given on chap 11 of the eagle book,
+ * as using that method
+ * requires parsing the string more than once.
+ */
size_t ch_len = strlen(ch);
for (size_t i = 0 ; i < ch_len; i++ ){
-
+
switch ( ch[i] ) {
/* test for end of string */
@@ -80,7 +86,9 @@
}
break;
- /* have we reached the end of the value, and are switching to a new name? */
+ /* have we reached the end of the value,
+ * and are switching to a new name?
+ */
case '&':
if ( ( ! pStr.empty() ) && pPtr) {
pPtr->add_value( pStr );
@@ -163,8 +171,8 @@
(*this) << "I recieved: " << env_.size() << " elements\n";
- for ( hash_type::const_iterator it = env_.begin();
- it != env_.end(); it++ ) {
+ for( hash_type::const_iterator it = env_.begin();
+ it != env_.end(); it++ ) {
(*this) << (*it).first << " has " << (*it).second->num_vals() << " values\n";
for ( int i = 0; i < (*it).second->num_vals() ; i++ ){
|
|
From: Mod C. C. L. <mod...@so...> - 2002-06-19 14:11:38
|
Mod Cplusplus CVS committal
Author : gr84b8
Project : mod_cplusplus
Module : include
Dir : mod_cplusplus/include
Modified Files:
apache_filters.h apache_handler.h apache_output_buffer.h
apache_protocol.h cpp_request.h cpp_server.h env_value.h
mod_cplusplus.h request_env.h
Log Message:
fix up a bunch of things to allow for proper win32 builds. first: export all symbols properly, second: match types to eliminate compiler barfs, third: complete move to using apr for dso loading
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/include/apache_filters.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- apache_filters.h 26 Apr 2002 18:57:00 -0000 1.6
+++ apache_filters.h 19 Jun 2002 14:11:07 -0000 1.7
@@ -1,10 +1,19 @@
-
#ifndef __APACHE_FILTERS_H__
#define __APACHE_FILTERS_H__
+#ifdef WIN32
+#ifdef EXPORT_MODCPP
+#define MODCPP_API __declspec(dllexport)
+#else
+#define MODCPP_API __declspec(dllimport)
+#endif /* EXPORT_MODCPP */
+#else
+#define MODCPP_API
+#endif /* WIN32 */
+
#include "apache_handler.h"
-class ApacheInputFilter : public ApacheBase
+class MODCPP_API ApacheInputFilter : public ApacheBase
{
public:
ApacheInputFilter() { }
@@ -23,7 +32,7 @@
{ return DECLINED; }
};
-class ApacheOutputFilter : public ApacheBase
+class MODCPP_API ApacheOutputFilter : public ApacheBase
{
public:
ApacheOutputFilter() { }
@@ -36,5 +45,4 @@
{ return DECLINED; }
};
-
-#endif // __APACHE_FILTERS_H__
+#endif /* __APACHE_FILTERS_H__ */
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/include/apache_handler.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- apache_handler.h 4 Jun 2001 00:40:35 -0000 1.9
+++ apache_handler.h 19 Jun 2002 14:11:07 -0000 1.10
@@ -1,21 +1,31 @@
#ifndef APACHE_HANDLER_H
#define APACHE_HANDLER_H
+#ifdef WIN32
+#ifdef EXPORT_MODCPP
+#define MODCPP_API __declspec(dllexport)
+#else
+#define MODCPP_API __declspec(dllimport)
+#endif /* EXPORT_MODCPP */
+#else
+#define MODCPP_API
+#endif /* WIN32 */
+
#include "mod_cplusplus.h"
#include "cpp_request.h"
-class ApacheInputFilter;
-class ApacheOutputFilter;
-class ApacheProtocol;
+class MODCPP_API ApacheInputFilter;
+class MODCPP_API ApacheOutputFilter;
+class MODCPP_API ApacheProtocol;
-class ApacheBase
+class MODCPP_API ApacheBase
{
protected:
char *get_cpp_var(ApacheRequestRec *r, const char *name);
};
-class ApacheHandler : public ApacheBase
+class MODCPP_API ApacheHandler : public ApacheBase
{
public:
ApacheHandler() { }
@@ -44,4 +54,4 @@
protocol_factory protocol_func;
} cpp_factory_t;
-#endif
+#endif /* APACHE_HANDLER_H */
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/include/apache_output_buffer.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- apache_output_buffer.h 3 May 2002 17:20:43 -0000 1.3
+++ apache_output_buffer.h 19 Jun 2002 14:11:07 -0000 1.4
@@ -1,6 +1,16 @@
#ifndef __APACHE_OUTPUT_BUFFER__
#define __APACHE_OUTPUT_BUFFER__
+#ifdef WIN32
+#ifdef EXPORT_MODCPP
+#define MODCPP_API __declspec(dllexport)
+#else
+#define MODCPP_API __declspec(dllimport)
+#endif /* EXPORT_MODCPP */
+#else
+#define MODCPP_API
+#endif /* WIN32 */
+
#if (defined (__GNUC__) && (__GNUC__ < 3))
#include <rope>
#else
@@ -16,8 +26,8 @@
#include <iostream>
#include <string>
-class apache_output_buffer : public std::streambuf {
- public:
+class MODCPP_API apache_output_buffer : public std::streambuf {
+ public:
apache_output_buffer( request_rec* r, bool buffer = false );
~apache_output_buffer();
@@ -25,24 +35,22 @@
/* if buffering output, send buffered output to browser immediatly */
int flush();
- /* if buffering output, clear buffer */
+ /* if beffering output, clear buffer */
void clear();
/* set whether or not to buffer output */
void buffer ( bool val );
- /* is output being buffered? */
+ /* is output being buffered? */
bool buffer();
- /*
- * set what content type should be sent
+ /* set what content type should be sent
* to browser. Returns true on success, false
* if we've already sent some content, and it's to
* late to resend.
- */
+ */
bool set_content_type(const std::string& type);
-
protected:
int overflow(int c);
@@ -57,5 +65,4 @@
};
-#endif // __APACHE_OUTPUT_BUFFER__
-
+#endif /* __APACHE_OUTPUT_BUFFER__ */
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/include/apache_protocol.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- apache_protocol.h 4 Jun 2001 00:40:35 -0000 1.1
+++ apache_protocol.h 19 Jun 2002 14:11:07 -0000 1.2
@@ -1,9 +1,24 @@
+#ifndef APACHE_PROTOCOL_H
+#define APACHE_PROTOCOL_H
+
+#ifdef WIN32
+#ifdef EXPORT_MODCPP
+#define MODCPP_API __declspec(dllexport)
+#else
+#define MODCPP_API __declspec(dllimport)
+#endif /* EXPORT_MODCPP */
+#else
+#define MODCPP_API
+#endif /* WIN32 */
+
#include "apache_handler.h"
-class ApacheProtocol
+class MODCPP_API ApacheProtocol
{
public:
ApacheProtocol() { }
virtual ~ApacheProtocol() { }
virtual int process_connection(conn_rec *c) { return DECLINED; }
};
+
+#endif /* APACHE_PROTOCOL_H */
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/include/cpp_request.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- cpp_request.h 17 Apr 2002 01:32:25 -0000 1.7
+++ cpp_request.h 19 Jun 2002 14:11:07 -0000 1.8
@@ -1,12 +1,26 @@
-#include "httpd.h"
-#include "http_request.h"
-#include "http_config.h"
-#include "http_core.h"
-#include "http_protocol.h"
-#include "apr_strings.h"
+#ifndef CPP_REQUEST_H
+#define CPP_REQUEST_H
+
+#ifdef WIN32
+#pragma warning( disable : 4275 4273 4786 )
+#ifdef EXPORT_MODCPP
+#define MODCPP_API __declspec(dllexport)
+#else
+#define MODCPP_API __declspec(dllimport)
+#endif /* EXPORT_MODCPP */
+#else
+#define MODCPP_API
+#endif /* WIN32 */
+
+#include <httpd.h>
+#include <http_request.h>
+#include <http_config.h>
+#include <http_core.h>
+#include <http_protocol.h>
+#include <apr_strings.h>
#include "cpp_server.h"
-class ApacheRequestRec
+class MODCPP_API ApacheRequestRec
{
private:
request_rec *mRequest;
@@ -39,18 +53,18 @@
int status() {return mRequest->status; }
const char *method() { return mRequest->method; }
int method_number() { return mRequest->method_number; }
- int allowed() { return mRequest->allowed; }
+ apr_int64_t allowed() { return mRequest->allowed; }
apr_array_header_t *allowed_xmethods() {return mRequest->allowed_xmethods; }
ap_method_list_t *allowed_methods() {return mRequest->allowed_methods; }
- int sent_bodyct() {return mRequest->sent_bodyct; }
- long bytes_sent() { return mRequest->bytes_sent; }
+ apr_off_t sent_bodyct() {return mRequest->sent_bodyct; }
+ apr_off_t bytes_sent() { return mRequest->bytes_sent; }
apr_time_t mtime() { return mRequest->mtime; }
int chunked() { return mRequest->chunked; }
- const char *boundary() {return mRequest->boundary; }
+ /* const char *boundary() {return mRequest->boundary; } */
const char *range() {return mRequest->range; }
apr_off_t clength() {return mRequest->clength; }
- apr_size_t remaining() {return mRequest->remaining; }
- int read_length() { return mRequest->read_length; }
+ apr_off_t remaining() {return mRequest->remaining; }
+ apr_off_t read_length() { return mRequest->read_length; }
int read_body() { return mRequest->read_body; }
int read_chunked() { return mRequest->read_chunked; }
@@ -109,13 +123,13 @@
const char *get_remote_logname() { return ap_get_remote_logname(mRequest); }
const char *get_server_name() { return ap_get_server_name(mRequest); }
void custom_response(int status, const char *str)
- { return ap_custom_response(mRequest, status, (char *)str); }
+ { ap_custom_response(mRequest, status, (char *)str); }
void internal_redirect(const char *new_uri)
- { return ap_internal_redirect(new_uri, mRequest); }
+ { ap_internal_redirect(new_uri, mRequest); }
void internal_redirect_handler(const char *new_uri)
- { return ap_internal_redirect(new_uri, mRequest); }
+ { ap_internal_redirect(new_uri, mRequest); }
int some_auth_required()
{ return ap_some_auth_required(mRequest); }
@@ -124,7 +138,7 @@
{ return ap_is_initial_req(mRequest); }
void update_mtime(apr_time_t dependency_mtime)
- { return ap_update_mtime(mRequest, dependency_mtime); }
+ { ap_update_mtime(mRequest, dependency_mtime); }
void allow_methods(int reset, ...);
@@ -132,3 +146,5 @@
void dump_table(apr_table_t *pTable);
request_rec *get_request_rec() { return mRequest; }
};
+
+#endif /* CPP_REQUEST_H */
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/include/cpp_server.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- cpp_server.h 21 May 2001 18:10:56 -0000 1.1
+++ cpp_server.h 19 Jun 2002 14:11:07 -0000 1.2
@@ -1,7 +1,20 @@
-#include "httpd.h"
-#include "http_config.h"
+#ifndef CPP_SERVER_H
+#define CPP_SERVER_H
-class ApacheServerRec
+#ifdef WIN32
+#ifdef EXPORT_MODCPP
+#define MODCPP_API __declspec(dllexport)
+#else
+#define MODCPP_API __declspec(dllimport)
+#endif /* EXPORT_MODCPP */
+#else
+#define MODCPP_API
+#endif /* WIN32 */
+
+#include <httpd.h>
+#include <http_config.h>
+
+class MODCPP_API ApacheServerRec
{
private:
server_rec *mServer;
@@ -47,3 +60,5 @@
void *get_module_config(module *m);
};
+
+#endif /* CPP_SERVER_H */
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/include/env_value.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- env_value.h 3 May 2002 16:50:27 -0000 1.2
+++ env_value.h 19 Jun 2002 14:11:07 -0000 1.3
@@ -1,11 +1,21 @@
#ifndef __ENV_VALUE_H__
#define __ENV_VALUE_H__
+#ifdef WIN32
+#ifdef EXPORT_MODCPP
+#define MODCPP_API __declspec(dllexport)
+#else
+#define MODCPP_API __declspec(dllimport)
+#endif /* EXPORT_MODCPP */
+#else
+#define MODCPP_API
+#endif /* WIN32 */
+
#include <vector>
#include "request_env.h"
#include <iterator>
-class env_value {
+class MODCPP_API env_value {
friend class request_env;
public:
typedef std::vector<std::string>::const_iterator const_iterator;
@@ -22,4 +32,4 @@
};
-#endif // __ENV_VALUE_H__
+#endif /* __ENV_VALUE_H__ */
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/include/mod_cplusplus.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- mod_cplusplus.h 6 May 2002 16:31:30 -0000 1.12
+++ mod_cplusplus.h 19 Jun 2002 14:11:07 -0000 1.13
@@ -1,11 +1,14 @@
-#include "httpd.h"
-#include "http_config.h"
-#include "http_protocol.h"
-#include "http_request.h"
-#include "http_connection.h"
-#include "http_log.h"
-#include "apr_strings.h"
-#include "apr_hash.h"
+#ifndef MOD_CPLUSPLUS_H
+#define MOD_CPLUSPLUS_H
+
+#include <httpd.h>
+#include <http_config.h>
+#include <http_protocol.h>
+#include <http_request.h>
+#include <http_connection.h>
+#include <http_log.h>
+#include <apr_strings.h>
+#include <apr_hash.h>
#define MAX_HANDLERS 20
@@ -26,11 +29,12 @@
apr_hash_t *var_hash;
} cpp_config_rec;
-extern module AP_MODULE_DECLARE_DATA cplusplus_module;
+/* module AP_MODULE_DECLARE_DATA cplusplus_module; */
#ifdef __cplusplus
extern "C" {
#endif
+ extern AP_MODULE_DECLARE_DATA module cplusplus_module;
extern int cpp_call_handler(request_rec *r);
extern int cpp_call_post_read_request(request_rec *r);
extern int cpp_call_translate_name(request_rec *r);
@@ -67,4 +71,4 @@
}
#endif
-
+#endif /* MOD_CPLUSPLUS_H */
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/include/request_env.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- request_env.h 3 May 2002 16:50:27 -0000 1.2
+++ request_env.h 19 Jun 2002 14:11:07 -0000 1.3
@@ -1,6 +1,16 @@
#ifndef __REQUEST_ENV_H__
#define __REQUEST_ENV_H__
+#ifdef WIN32
+#ifdef EXPORT_MODCPP
+#define MODCPP_API __declspec(dllexport)
+#else
+#define MODCPP_API __declspec(dllimport)
+#endif /* EXPORT_MODCPP */
+#else
+#define MODCPP_API
+#endif /* WIN32 */
+
#include "apache_filters.h"
#if (defined (__GNUC__) && (__GNUC__ < 3))
#include <hash_map>
@@ -17,12 +27,12 @@
class env_value;
-class request_env : public std::ostream {
+class MODCPP_API request_env : public std::ostream {
public:
request_env( request_rec *r,bool buffer = false );
- /* dump the values in ( hopefully ) nicely formatted html */
+ /* dump the values in ( hopefully ) nicely formatted html */
void dump();
/* is request a post? */
@@ -30,10 +40,10 @@
/* returns number of bytes written to client, -1 on failure */
int flush();
-
+
/* set the content type. Defaults to text/html if not set */
bool set_content_type(const std::string& type);
-
+
void set_buffered( bool val );
bool is_buffered();
void clear_buffer();
@@ -69,4 +79,4 @@
};
-#endif // __REQUEST_ENV_H__
+#endif /* __REQUEST_ENV_H__ */
|
|
From: Mod C. C. L. <mod...@so...> - 2002-06-19 14:11:37
|
Mod Cplusplus CVS committal
Author : gr84b8
Module : mod_cplusplus
Dir : mod_cplusplus
Modified Files:
ChangeLog
Added Files:
mod_cplusplus.dsp
Log Message:
fix up a bunch of things to allow for proper win32 builds. first: export all symbols properly, second: match types to eliminate compiler barfs, third: complete move to using apr for dso loading
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ChangeLog 26 Apr 2002 18:56:59 -0000 1.7
+++ ChangeLog 19 Jun 2002 14:11:06 -0000 1.8
@@ -1,3 +1,12 @@
+2002-06-16 John K. Sterling <jo...@st...>
+ * Made additional changes to support win32. The code and dso work
+ should be complete, but the dsp project file has lots of hardcoded
+ paths. Until I am able to get a win32 build machine up I will check
+ this in and request that it be made more generic.
+ (Submitted by John P. Coffey <co...@rc...>)
+2002-05-03 John K. Sterling <jo...@st...
+ * Change the dso work to use apr instead of direct calls to dlopen. This
+ will help with the porting effort.
2002-04-25 John K. Sterling <jo...@st...>
* Added enviroment decode class to decode request parameters.
Handles both get and post requests, and also features
|
1264 messages has been excluded from this view by a project administrator.
