joes 2003/10/14 11:53:30
Modified: env libapreq_cgi.c mod_apreq.c
glue/perl/xsbuilder apreq_xs_postperl.h
src apreq_env.h
t env.c
Log:
Added apreq_env_magic_number to provide module versioning. Also renamed
apreq_env to apreq_env_name. Updated modules, tests, and perl glue accordingly.
Revision Changes Path
1.10 +2 -1 httpd-apreq-2/env/libapreq_cgi.c
Index: libapreq_cgi.c
===================================================================
RCS file: /home/cvs/httpd-apreq-2/env/libapreq_cgi.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libapreq_cgi.c 20 Aug 2003 06:24:09 -0000 1.9
+++ libapreq_cgi.c 14 Oct 2003 18:53:30 -0000 1.10
@@ -89,7 +89,8 @@
apr_status_t status;
};
-const char apreq_env[] = "CGI";
+const char apreq_env_name[] = "CGI";
+const unsigned int apreq_env_magic_number = 20031014;
#define CRLF "\015\012"
1.29 +3 -2 httpd-apreq-2/env/mod_apreq.c
Index: mod_apreq.c
===================================================================
RCS file: /home/cvs/httpd-apreq-2/env/mod_apreq.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- mod_apreq.c 1 Oct 2003 20:00:36 -0000 1.28
+++ mod_apreq.c 14 Oct 2003 18:53:30 -0000 1.29
@@ -82,6 +82,9 @@
* @{
*/
+const char apreq_env_name[] = "APACHE2"; /**< internal name of module */
+const unsigned int apreq_env_magic_number = 20031014; /**< ABI version */
+
/** The warehouse. */
struct env_config {
apreq_jar_t *jar;
@@ -96,8 +99,6 @@
apr_status_t status;
};
-
-const char apreq_env[] = "APACHE2"; /**< internal name of module */
static const char filter_name[] = "APREQ";
module AP_MODULE_DECLARE_DATA apreq_module;
1.16 +1 -1 httpd-apreq-2/glue/perl/xsbuilder/apreq_xs_postperl.h
Index: apreq_xs_postperl.h
===================================================================
RCS file: /home/cvs/httpd-apreq-2/glue/perl/xsbuilder/apreq_xs_postperl.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- apreq_xs_postperl.h 15 Jul 2003 13:15:10 -0000 1.15
+++ apreq_xs_postperl.h 14 Oct 2003 18:53:30 -0000 1.16
@@ -188,7 +188,7 @@
dXSARGS; \
/* map environment to package */ \
\
- if (strcmp(apreq_env, "APACHE2") == 0) \
+ if (strcmp(apreq_env_name, "APACHE2") == 0) \
class = "Apache::RequestRec"; \
\
/* else if ... add more conditionals here as \
1.19 +6 -3 httpd-apreq-2/src/apreq_env.h
Index: apreq_env.h
===================================================================
RCS file: /home/cvs/httpd-apreq-2/src/apreq_env.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- apreq_env.h 30 Jun 2003 20:42:14 -0000 1.18
+++ apreq_env.h 14 Oct 2003 18:53:30 -0000 1.19
@@ -113,12 +113,15 @@
*/
#ifndef WIN32
-extern const char apreq_env[];
+extern const char apreq_env_name[];
+extern const unsigned int apreq_env_magic_number; /**<+ YYYYMMDD */
#else
#if defined(MOD_APREQ_EXPORTS) || defined(LIBAPREQ_CGI_EXPORTS)
-__declspec(dllexport) const char apreq_env[];
+__declspec(dllexport) const char apreq_env_name[];
+__declspec(dllexport) const unsigned int apreq_env_magic_number;
#else
-__declspec(dllimport) const char apreq_env[];
+__declspec(dllimport) const char apreq_env_name[];
+__declspec(dllimport) const unsigned int apreq_env_magic_number;
#endif
#endif
1.9 +3 -1 httpd-apreq-2/t/env.c
Index: env.c
===================================================================
RCS file: /home/cvs/httpd-apreq-2/t/env.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- env.c 20 May 2003 20:27:32 -0000 1.8
+++ env.c 14 Oct 2003 18:53:30 -0000 1.9
@@ -65,7 +65,9 @@
/* rigged environent for unit tests */
-static const char env_name[] = "CGI";
+const char apreq_env_name[] = "CGI";
+const unsigned int apreq_env_magic_number = 20031014;
+
#define CRLF "\015\012"
apr_bucket_brigade *bb;
