dougm 98/06/30 18:37:31
Modified: . STATUS
src CHANGES
src/include hsregex.h
src/modules/standard mod_include.c
Log:
add support for #perl arg interpolation in mod_include
Submitted by: Doug MacEachern
Reviewed by: Dean Gaudet, Howard Fear
Revision Changes Path
1.434 +1 -5 apache-1.3/STATUS
Index: STATUS
===================================================================
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.433
retrieving revision 1.434
diff -u -r1.433 -r1.434
--- STATUS 1998/06/30 08:09:13 1.433
+++ STATUS 1998/07/01 01:37:26 1.434
@@ -22,7 +22,7 @@
situation it runs fine. Sure, its mod_perl's fault because its mod_perl
code which returns DECLINED. But it definitely seems to be caused by a
missing init in mod_so under DSO situation. I've already asked Doug for
- hints but he still has no clue.
+ hints but he has not had a chance to look into it.
Currently at least mod_perl is broken under the DSO situation because
of
this missing init in mod_so. But perhaps there are more modules which
@@ -48,10 +48,6 @@
* Filenames containing whitespace characters caused problems for
directives
Bill Stoddard <[EMAIL PROTECTED]>
Message-ID: <[EMAIL PROTECTED]>
-
- * Fix mod_include #perl arg interpolation
- Doug MacEachern <[EMAIL PROTECTED]>
- Message-Id: <[EMAIL PROTECTED]>
* PR#2483 reports that RewriteMap program still don't work under Win32
because
of a SIGSEGV. The reporter is right, ap_spawn_child_core() calls the
child
1.942 +3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.941
retrieving revision 1.942
diff -u -r1.941 -r1.942
--- CHANGES 1998/06/30 08:08:33 1.941
+++ CHANGES 1998/07/01 01:37:27 1.942
@@ -1,5 +1,8 @@
Changes with Apache 1.3.1
+ *) add support for #perl arg interpolation in mod_include
+ [Doug MacEachern]
+
*) API: Name changes of table_elts to ap_table_elts and is_table_empty
to ap_is_table_empty. [Ben Laurie]
1.6 +0 -2 apache-1.3/src/include/hsregex.h
Index: hsregex.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/hsregex.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- hsregex.h 1998/04/06 05:21:41 1.5
+++ hsregex.h 1998/07/01 01:37:29 1.6
@@ -6,12 +6,10 @@
#endif
/* === regex2.h === */
-#ifndef API_EXPORT
#ifdef WIN32
#define API_EXPORT(type) __declspec(dllexport) type __stdcall
#else
#define API_EXPORT(type) type
-#endif
#endif
typedef off_t regoff_t;
1.97 +3 -1 apache-1.3/src/modules/standard/mod_include.c
Index: mod_include.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_include.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- mod_include.c 1998/06/27 18:09:32 1.96
+++ mod_include.c 1998/07/01 01:37:29 1.97
@@ -918,6 +918,7 @@
static int handle_perl(FILE *in, request_rec *r, const char *error)
{
char tag[MAX_STRING_LEN];
+ char parsed_string[MAX_STRING_LEN];
char *tag_val;
SV *sub = Nullsv;
AV *av = newAV();
@@ -936,7 +937,8 @@
sub = newSVpv(tag_val, 0);
}
else if (strnEQ(tag, "arg", 3)) {
- av_push(av, newSVpv(tag_val, 0));
+ parse_string(r, tag_val, parsed_string, sizeof(parsed_string),
0);
+ av_push(av, newSVpv(parsed_string, 0));
}
else if (strnEQ(tag, "done", 4)) {
break;
