bjh 99/05/25 08:24:02
Modified: src ApacheCoreOS2.def
src/include ap_compat.h
src/main util.c
src/support httpd.exp
Log:
Force regerror() to be linked into the core so DSOs can use the core's regex
library. regerror() is needed by PHP3.
Revision Changes Path
1.2 +2 -1 apache-1.3/src/ApacheCoreOS2.def
Index: ApacheCoreOS2.def
===================================================================
RCS file: /home/cvs/apache-1.3/src/ApacheCoreOS2.def,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ApacheCoreOS2.def 1999/05/04 11:21:07 1.1
+++ ApacheCoreOS2.def 1999/05/25 15:23:55 1.2
@@ -268,7 +268,7 @@
; os_stat @261
; readdir @262
regcomp @263
- regexec @264
+ ap_regexec @264
regfree @265
; access_module @266
; alias_module @267
@@ -348,3 +348,4 @@
ap_my_generation @342
ap_dummy_mutex @343
ap_signal @344
+ ap_regerror @345
1.19 +1 -0 apache-1.3/src/include/ap_compat.h
Index: ap_compat.h
===================================================================
RCS file: /home/cvs/apache-1.3/src/include/ap_compat.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ap_compat.h 1999/05/21 12:16:18 1.18
+++ ap_compat.h 1999/05/25 15:23:56 1.19
@@ -306,6 +306,7 @@
#define read_config ap_read_config
#define read_request ap_read_request
#define regexec ap_regexec
+#define regerror ap_regerror
#define register_cleanup ap_register_cleanup
#define register_other_child ap_register_other_child
#define release_mutex ap_release_mutex
1.162 +6 -0 apache-1.3/src/main/util.c
Index: util.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/main/util.c,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- util.c 1999/05/21 12:16:21 1.161
+++ util.c 1999/05/25 15:24:01 1.162
@@ -293,6 +293,12 @@
return regexec(preg, string, nmatch, pmatch, eflags);
}
+API_EXPORT(size_t) ap_regerror(int errcode, const regex_t *preg, char
*errbuf, size_t errbuf_size)
+{
+ return regerror(errcode, preg, errbuf, errbuf_size);
+}
+
+
/* This function substitutes for $0-$9, filling in regular expression
* submatches. Pass it the same nmatch and pmatch arguments that you
* passed ap_regexec(). pmatch should not be greater than the maximum number
1.20 +1 -0 apache-1.3/src/support/httpd.exp
Index: httpd.exp
===================================================================
RCS file: /home/cvs/apache-1.3/src/support/httpd.exp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- httpd.exp 1999/05/21 12:16:23 1.19
+++ httpd.exp 1999/05/25 15:24:02 1.20
@@ -249,6 +249,7 @@
ap_rationalize_mtime
ap_read_config
ap_read_request
+ap_regerror
ap_regexec
ap_register_cleanup
ap_register_other_child
