cvs commit: apache-2.0/src/lib/apr/network_io/unix networkio.h sockaddr.c
stoddard00/01/20 17:25:43 Modified:src acinclude.m4 src/include ap_ac_config.h httpd.h src/lib/apr/lib apr_snprintf.c src/lib/apr/network_io/unix networkio.h sockaddr.c Log: Back out most of the last commit. Keep APR macros seperate from Apache macros. Revision ChangesPath 1.19 +1 -1 apache-2.0/src/acinclude.m4 Index: acinclude.m4 === RCS file: /export/home/cvs/apache-2.0/src/acinclude.m4,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- acinclude.m4 2000/01/20 22:14:05 1.18 +++ acinclude.m4 2000/01/21 01:25:20 1.19 @@ -157,7 +157,7 @@ #ifdef HAVE_SYS_SOCKET_H #include sys/socket.h #endif -#if APR_HAVE_NETINET_IN_H +#ifdef HAVE_NETINET_IN_H #include netinet/in.h #endif #ifdef HAVE_ARPA_INET_H 1.7 +1 -1 apache-2.0/src/include/ap_ac_config.h Index: ap_ac_config.h === RCS file: /export/home/cvs/apache-2.0/src/include/ap_ac_config.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ap_ac_config.h2000/01/20 22:14:12 1.6 +++ ap_ac_config.h2000/01/21 01:25:24 1.7 @@ -105,7 +105,7 @@ #include sys/socket.h #endif -#if APR_HAVE_NETINET_IN_H +#ifdef HAVE_NETINET_IN_H #include netinet/in.h #endif 1.22 +1 -1 apache-2.0/src/include/httpd.h Index: httpd.h === RCS file: /export/home/cvs/apache-2.0/src/include/httpd.h,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- httpd.h 2000/01/20 22:14:15 1.21 +++ httpd.h 2000/01/21 01:25:25 1.22 @@ -81,7 +81,7 @@ #include ap.h #include ap_mmn.h -#if APR_HAVE_NETINET_IN_H +#ifdef HAVE_NETINET_IN_H #include netinet/in.h #endif 1.9 +1 -1 apache-2.0/src/lib/apr/lib/apr_snprintf.c Index: apr_snprintf.c === RCS file: /export/home/cvs/apache-2.0/src/lib/apr/lib/apr_snprintf.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- apr_snprintf.c2000/01/20 22:14:23 1.8 +++ apr_snprintf.c2000/01/21 01:25:30 1.9 @@ -70,7 +70,7 @@ #ifdef HAVE_CTYPE_H #include ctype.h #endif -#if APR_HAVE_NETINET_IN_H +#ifdef HAVE_NETINET_IN_H #include netinet/in.h #endif #ifdef HAVE_SYS_SOCKET_H 1.15 +1 -1 apache-2.0/src/lib/apr/network_io/unix/networkio.h Index: networkio.h === RCS file: /export/home/cvs/apache-2.0/src/lib/apr/network_io/unix/networkio.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- networkio.h 2000/01/20 22:14:30 1.14 +++ networkio.h 2000/01/21 01:25:34 1.15 @@ -86,7 +86,7 @@ #if HAVE_NETINET_TCP_H #include netinet/tcp.h #endif -#if APR_HAVE_NETINET_IN_H +#if HAVE_NETINET_IN_H #include netinet/in.h #endif #if HAVE_ARPA_INET_H 1.4 +1 -1 apache-2.0/src/lib/apr/network_io/unix/sockaddr.c Index: sockaddr.c === RCS file: /export/home/cvs/apache-2.0/src/lib/apr/network_io/unix/sockaddr.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sockaddr.c2000/01/20 22:14:33 1.3 +++ sockaddr.c2000/01/21 01:25:36 1.4 @@ -203,7 +203,7 @@ -#if APR_HAVE_NETINET_IN_H +#if HAVE_NETINET_IN_H /* ***APRDOC * ap_status_t ap_get_local_name(struct sockaddr_in **name, const ap_socket_t *socket) *Return the local socket name as a BSD style struct sockaddr_in.
cvs commit: apache-2.0/src/lib/apr/lib apr_snprintf.c
stoddard00/01/20 18:04:16 Modified:src/lib/apr/lib apr_snprintf.c Log: It's cold tonite! Revision ChangesPath 1.10 +1 -1 apache-2.0/src/lib/apr/lib/apr_snprintf.c Index: apr_snprintf.c === RCS file: /export/home/cvs/apache-2.0/src/lib/apr/lib/apr_snprintf.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- apr_snprintf.c2000/01/21 01:25:30 1.9 +++ apr_snprintf.c2000/01/21 02:04:09 1.10 @@ -70,7 +70,7 @@ #ifdef HAVE_CTYPE_H #include ctype.h #endif -#ifdef HAVE_NETINET_IN_H +#if HAVE_NETINET_IN_H #include netinet/in.h #endif #ifdef HAVE_SYS_SOCKET_H
cvs commit: apache-2.0/src/include http_core.h
stoddard00/01/21 10:42:55
Modified:src/include http_core.h
Log:
Add back the script_interpreter_source code.
Revision ChangesPath
1.5 +16 -0 apache-2.0/src/include/http_core.h
Index: http_core.h
===
RCS file: /home/cvs/apache-2.0/src/include/http_core.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- http_core.h 2000/01/19 01:14:29 1.4
+++ http_core.h 2000/01/21 18:42:45 1.5
@@ -154,6 +154,17 @@
API_EXPORT(int) ap_satisfies (request_rec *r);
API_EXPORT(const ap_array_header_t *) ap_requires (request_rec *);
+#ifdef WIN32
+/*
+ * CGI Script stuff for Win32...
+ */
+typedef enum { eFileTypeUNKNOWN, eFileTypeBIN, eFileTypeEXE16,
eFileTypeEXE32,
+ eFileTypeSCRIPT } file_type_e;
+typedef enum { INTERPRETER_SOURCE_UNSET, INTERPRETER_SOURCE_REGISTRY,
+ INTERPRETER_SOURCE_SHEBANG } interpreter_source_e;
+API_EXPORT(file_type_e) ap_get_win32_interpreter(const request_rec *, char
**);
+#endif
+
#ifdef CORE_PRIVATE
/*
@@ -245,6 +256,11 @@
ap_array_header_t *sec;
regex_t *r;
+#ifdef WIN32
+/* Where to find interpreter to run scripts */
+interpreter_source_e script_interpreter_source;
+#endif
+
} core_dir_config;
/* Per-server core configuration */
cvs commit: apache-2.0/src/main util_uri.c
stoddard00/01/21 11:13:27 Modified:src/main util_uri.c Log: Let ap_config.h figure out whether netdb.h should be included or not. This fixes a compile problem on platforms that do not have netdb.h. Revision ChangesPath 1.5 +1 -1 apache-2.0/src/main/util_uri.c Index: util_uri.c === RCS file: /export/home/cvs/apache-2.0/src/main/util_uri.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- util_uri.c2000/01/19 01:15:15 1.4 +++ util_uri.c2000/01/21 19:13:24 1.5 @@ -63,7 +63,7 @@ #include http_log.h #include util_uri.h #include string.h -#include netdb.h +#include ap_config.h /* Some WWW schemes and their default ports; this is basically /etc/services */ /* This will become global when the protocol abstraction comes */
cvs commit: apache-2.0/src/modules/standard mod_so.c
stoddard00/01/21 11:24:49 Modified:src/modules/standard mod_so.c Log: Fix Windows compile breakage. Revision ChangesPath 1.7 +1 -0 apache-2.0/src/modules/standard/mod_so.c Index: mod_so.c === RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_so.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mod_so.c 1999/11/19 18:48:54 1.6 +++ mod_so.c 2000/01/21 19:24:46 1.7 @@ -129,6 +129,7 @@ #include httpd.h #include http_config.h #include http_log.h +#include ap_config.h module MODULE_VAR_EXPORT so_module;
cvs commit: apache-site related_projects.html
coar00/01/21 13:22:46 Modified:.related_projects.html Log: Add another 'relation.' Submitted by: Bob Beck [EMAIL PROTECTED] Reviewed by: Ken Coar Revision ChangesPath 1.43 +14 -0 apache-site/related_projects.html Index: related_projects.html === RCS file: /home/cvs/apache-site/related_projects.html,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- related_projects.html 1999/10/26 06:37:09 1.42 +++ related_projects.html 2000/01/21 21:22:42 1.43 @@ -40,6 +40,7 @@ UL LIA HREF=#apacheweekApache Week/A (free weekly newsletter) +lia href=#tcsApache/Stronghold for Trusted Solaris/a/li LIA HREF=#ravenCovalent Raven SSL module/A LIA HREF=#ibmIBM HTTP Server powered by Apache/A LIA HREF=#matriceMatrice W3/A @@ -101,6 +102,19 @@ purposes for free. PHR +H3A NAME=tcs HREF=http://www.tcs-sec.com/; +Apache/Stronghold for Trusted Solaris/A/H3 +p +Trusted Computer Solutions, Inc. (TCS) offers a suite of Apache/Stronghold +based security solutions hosted on Sun's Trusted Solaris operating +system. Product and security information, white papers and the +company's latest news releases may be accessed ivia/i TCS' +World Wide Web site at +lt;URL:a href=http://www.tcs-sec.com;http://www.tcs-sec.com/agt; +or ivia/i email to lt;[EMAIL PROTECTED]gt;. +/p +hr + H3A NAME=raven HREF=http://ravenssl.com/;Covalent Raven SSL Module for Apache/A/H3 The Raven SSL module is a commerical product providing a strong
