You are viewing a plain text version of this content. The canonical link for it is here.
Posted to modperl-cvs@perl.apache.org by do...@hyperreal.org on 1998/07/23 00:59:36 UTC
cvs commit: modperl/t/conf httpd.conf-dist
dougm 98/07/22 15:59:36
Modified: . Changes Makefile.PL ToDo
src/modules/perl mod_perl.h perl_config.c
t/conf httpd.conf-dist
Log:
fixes to support to apache_1.3.0+ssl_1.19 [Salvador Ortiz]
Revision Changes Path
1.87 +2 -0 modperl/Changes
Index: Changes
===================================================================
RCS file: /export/home/cvs/modperl/Changes,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- Changes 1998/07/21 01:51:29 1.86
+++ Changes 1998/07/22 22:59:32 1.87
@@ -8,6 +8,8 @@
=item 1.14_01-dev
+fixes to support to apache_1.3.0+ssl_1.19 [Salvador Ortiz]
+
add another dTHR so we build/run with threaded Perl again
USE_APXS fixups:
1.74 +1 -0 modperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /export/home/cvs/modperl/Makefile.PL,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- Makefile.PL 1998/07/20 17:12:47 1.73
+++ Makefile.PL 1998/07/22 22:59:32 1.74
@@ -80,6 +80,7 @@
my $PWD = cwd;
my %SSL = (
+ "modules/ssl/apache_ssl.c" => "Ben-SSL",
"apache_ssl.c" => "Ben-SSL",
"mod_ssl.h" => "Stronghold",
);
1.49 +10 -0 modperl/ToDo
Index: ToDo
===================================================================
RCS file: /export/home/cvs/modperl/ToDo,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- ToDo 1998/07/20 17:51:49 1.48
+++ ToDo 1998/07/22 22:59:32 1.49
@@ -16,6 +16,16 @@
(well, close to it anyhow)
---------------------------------------------------------------------------
+- move /tmp/mod_perl_* to t/logs
+
+- deal with PL_ renaming in 5.005-beta2
+
+- move unescape_url and unescape_url_info to Apache::Util
+
+- add crit/emerg aliases to Apache::Log
+
+- add $r->get_server_port method
+
- /perl/perl-status?sig dumps core under hpux 10.20
[David-Michael.Lincke@unisg.ch]
1.36 +23 -0 modperl/src/modules/perl/mod_perl.h
Index: mod_perl.h
===================================================================
RCS file: /export/home/cvs/modperl/src/modules/perl/mod_perl.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- mod_perl.h 1998/07/17 15:23:03 1.35
+++ mod_perl.h 1998/07/22 22:59:34 1.36
@@ -25,7 +25,17 @@
#include "http_request.h"
#include "util_script.h"
#include "http_conf_globals.h"
+#ifdef APACHE_SSL
+#undef _
+#ifdef _config_h_
+#ifdef CAN_PROTOTYPE
+#define _(args) args
+#else
+#define _(args) ()
+#endif
#endif
+#endif
+#endif
#include "EXTERN.h"
#include "perl.h"
@@ -92,6 +102,16 @@
#include "http_request.h"
#include "util_script.h"
#include "http_conf_globals.h"
+#ifdef APACHE_SSL
+#undef _
+#ifdef _config_h_
+#ifdef CAN_PROTOTYPE
+#define _(args) args
+#else
+#define _(args) ()
+#endif
+#endif
+#endif
#ifdef __cplusplus
}
#endif
@@ -338,6 +358,9 @@
/* some 1.2.x/1.3.x compat stuff */
/* once 1.3.0 is here, we can toss most of this junk */
+
+#define MMN_130 19980527
+#define APACHE_SSL_12X (defined(APACHE_SSL) && (MODULE_MAGIC_NUMBER < MMN_130))
#if MODULE_MAGIC_NUMBER >= 19980627
#define MP_CONST_CHAR const char
1.25 +1 -1 modperl/src/modules/perl/perl_config.c
Index: perl_config.c
===================================================================
RCS file: /export/home/cvs/modperl/src/modules/perl/perl_config.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- perl_config.c 1998/07/17 15:23:03 1.24
+++ perl_config.c 1998/07/22 22:59:34 1.25
@@ -339,7 +339,7 @@
CHAR_P perl_cmd_push_handlers(char *hook, PERL_CMD_TYPE **cmd, char *arg, pool *p)
{
SV *sva;
-#if !defined(APACHE_SSL) && !defined(WIN32)
+#if !APACHE_SSL_12X && !defined(WIN32)
if(!PERL_RUNNING()) {
MP_TRACE_d(fprintf(stderr, "perl_cmd_push_handlers: perl not running, skipping push\n"));
return NULL;
1.8 +7 -0 modperl/t/conf/httpd.conf-dist
Index: httpd.conf-dist
===================================================================
RCS file: /export/home/cvs/modperl/t/conf/httpd.conf-dist,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- httpd.conf-dist 1998/07/18 18:59:36 1.7
+++ httpd.conf-dist 1998/07/22 22:59:35 1.8
@@ -188,6 +188,12 @@
Options +ExecCGI
</Files>
+<IfModule apache_ssl.c>
+SSLDisable
+SSLCacheServerPath /tmp
+SSLCacheServerPort /tmp/gcache_port
+</IfModule>
+
<Location /status>
SetHandler server-status
</Location>
@@ -205,4 +211,5 @@
SetHandler perl-script
PerlHandler $My::Obj->method
</Location>
+