cvs commit: apache-1.3/src/os/win32 os.h
stoddard99/09/13 06:32:42 Modified:src/include ap_config.h src/os/win32 os.h Log: A bit of WIN32 header file cleanup Revision ChangesPath 1.270 +1 -8 apache-1.3/src/include/ap_config.h Index: ap_config.h === RCS file: /home/cvs/apache-1.3/src/include/ap_config.h,v retrieving revision 1.269 retrieving revision 1.270 diff -u -r1.269 -r1.270 --- ap_config.h 1999/09/07 19:58:20 1.269 +++ ap_config.h 1999/09/13 13:32:40 1.270 @@ -108,8 +108,6 @@ #endif #ifdef WIN32 -/* include process.h first so we can override spawn[lv]e* properly */ -#include process.h #include ../os/win32/os.h #else #include os.h @@ -1065,13 +1063,8 @@ #ifndef O_BINARY #define O_BINARY (0) #endif - -#else /* WIN32 */ -#include winsock2.h -#include malloc.h -#include io.h -#include fcntl.h #endif /* ndef WIN32 */ + #include limits.h #include time.h/* for ctime */ #ifdef WIN32 1.31 +74 -3 apache-1.3/src/os/win32/os.h Index: os.h === RCS file: /home/cvs/apache-1.3/src/os/win32/os.h,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- os.h 1999/06/30 09:09:43 1.30 +++ os.h 1999/09/13 13:32:41 1.31 @@ -1,6 +1,79 @@ +/* + * Copyright (c) 1995-1999 The Apache Group. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in + *the documentation and/or other materials provided with the + *distribution. + * + * 3. All advertising materials mentioning features or use of this + *software must display the following acknowledgment: + *This product includes software developed by the Apache Group + *for use in the Apache HTTP server project (http://www.apache.org/). + * + * 4. The names Apache Server and Apache Group must not be used to + *endorse or promote products derived from this software without + *prior written permission. For written permission, please contact + *[EMAIL PROTECTED] + * + * 5. Products derived from this software may not be called Apache + *nor may Apache appear in their names without prior written + *permission of the Apache Group. + * + * 6. Redistributions of any form whatsoever must retain the following + *acknowledgment: + *This product includes software developed by the Apache Group + *for use in the Apache HTTP server project (http://www.apache.org/). + * + * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY + * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE GROUP OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + * + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Group and was originally based + * on public domain software written at the National Center for + * Supercomputing Applications, University of Illinois, Urbana-Champaign. + * For more information on the Apache Group and the Apache HTTP server + * project, please see http://www.apache.org/. + * + */ + #ifndef APACHE_OS_H #define APACHE_OS_H +/* + * Compile the server including all the Windows NT 4.0 header files by + * default. We still want the server to run on Win95/98 so use + * runtime checks before calling NT specific functions to verify we are + * really running on an NT system. + */ +#define _WIN32_WINNT 0x0400 + +#include windows.h +#include winsock2.h +#include mswsock.h +#include process.h +#include malloc.h +#include io.h +#include fcntl.h + #define PLATFORM
cvs commit: apache-1.3/src/os/win32 os.h
bjh 99/05/02 07:01:03
Modified:src/main alloc.c
src/os/bs2000 os.h
src/os/tpf os.h
src/os/unix os.h
src/os/win32 os.h
Log:
Make OS/2 CGI kill() change a bit cleaner by defining ap_os_kill() == kill()
on all other platforms, making it possible to remove the #ifdef from the
code.
Revision ChangesPath
1.112 +0 -5 apache-1.3/src/main/alloc.c
Index: alloc.c
===
RCS file: /home/cvs/apache-1.3/src/main/alloc.c,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- alloc.c 1999/05/01 05:15:51 1.111
+++ alloc.c 1999/05/02 14:01:01 1.112
@@ -2673,13 +2673,8 @@
if ((p-kill_how == kill_after_timeout)
|| (p-kill_how == kill_only_once)) {
/* Subprocess may be dead already. Only need the timeout if not. */
-#ifdef OS2
if (ap_os_kill(p-pid, SIGTERM) != -1)
need_timeout = 1;
-#else
- if (kill(p-pid, SIGTERM) != -1)
- need_timeout = 1;
-#endif
}
else if (p-kill_how == kill_always) {
kill(p-pid, SIGKILL);
1.17 +1 -0 apache-1.3/src/os/bs2000/os.h
Index: os.h
===
RCS file: /home/cvs/apache-1.3/src/os/bs2000/os.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- os.h 1999/03/11 09:57:36 1.16
+++ os.h 1999/05/02 14:01:02 1.17
@@ -32,6 +32,7 @@
/* Other ap_os_ routines not used by this platform */
#define ap_os_is_filename_valid(f) (1)
+#define ap_os_kill(pid, sig)kill(pid, sig)
/* Sorry if this is ugly, but the include order doesn't allow me
* to use request_rec here... */
1.7 +1 -0 apache-1.3/src/os/tpf/os.h
Index: os.h
===
RCS file: /home/cvs/apache-1.3/src/os/tpf/os.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- os.h 1999/04/27 20:36:38 1.6
+++ os.h 1999/05/02 14:01:02 1.7
@@ -33,6 +33,7 @@
/* Other ap_os_ routines not used by this platform */
#define ap_os_is_filename_valid(f) (1)
+#define ap_os_kill(pid, sig)kill(pid, sig)
/* Sorry if this is ugly, but the include order doesn't allow me
* to use request_rec here... */
1.39 +1 -0 apache-1.3/src/os/unix/os.h
Index: os.h
===
RCS file: /home/cvs/apache-1.3/src/os/unix/os.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- os.h 1999/01/08 23:46:46 1.38
+++ os.h 1999/05/02 14:01:03 1.39
@@ -89,6 +89,7 @@
/* Other ap_os_ routines not used by this platform */
#define ap_os_is_filename_valid(f) (1)
+#define ap_os_kill(pid, sig)kill(pid, sig)
/*
* Abstraction layer for loading
1.29 +3 -0 apache-1.3/src/os/win32/os.h
Index: os.h
===
RCS file: /home/cvs/apache-1.3/src/os/win32/os.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- os.h 1999/03/07 13:13:56 1.28
+++ os.h 1999/05/02 14:01:03 1.29
@@ -120,4 +120,7 @@
#define ap_os_dso_sym(h,s) GetProcAddress(h,s)
#define ap_os_dso_error() /* for now */
+/* Other ap_os_ routines not used by this platform */
+#define ap_os_kill(pid, sig)kill(pid, sig)
+
#endif /* ! APACHE_OS_H */
cvs commit: apache-1.3/src/os/win32 os.h
fielding99/01/08 12:08:28 Modified:src CHANGES src/include ap_mmn.h httpd.h src/main http_request.c util.c src/os/bs2000 os.h src/os/os2 os.h src/os/tpf os.h src/os/unix os.h src/os/win32 os.h Log: Moved prototypes/defines for ap_os_canonical_filename(), ap_os_case_canonical_filename(), ap_os_systemcase_filename(), and ap_os_is_filename_valid() from httpd.h to the separate os.h files. Moved BS2000-specific os_set_account() and os_init_job_environment() prototypes to bs2000/os.h. HAVE_CANONICAL_FILENAME no londer needed. Revision ChangesPath 1.1208+6 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1207 retrieving revision 1.1208 diff -u -r1.1207 -r1.1208 --- CHANGES 1999/01/08 17:54:37 1.1207 +++ CHANGES 1999/01/08 20:08:18 1.1208 @@ -1,5 +1,11 @@ Changes with Apache 1.3.4 + *) Moved prototypes/defines for ap_os_canonical_filename(), + ap_os_case_canonical_filename(), ap_os_systemcase_filename(), and + ap_os_is_filename_valid() from httpd.h to the separate os.h files. + Moved BS2000-specific os_set_account() and os_init_job_environment() + prototypes to bs2000/os.h. [Roy Fielding] + *) Renamed macros status_drops_connection to ap_status_drops_connection and vestigial scan_script_header to ap_scan_script_header_err, mostly for aesthetic reasons. [Roy Fielding] 1.21 +1 -1 apache-1.3/src/include/ap_mmn.h Index: ap_mmn.h === RCS file: /home/cvs/apache-1.3/src/include/ap_mmn.h,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- ap_mmn.h 1999/01/06 19:14:51 1.20 +++ ap_mmn.h 1999/01/08 20:08:21 1.21 @@ -195,7 +195,7 @@ * 19990101 - renamed macro escape_uri() to ap_escape_uri() * - added MODULE_MAGIC_COOKIE to identify module structs * 19990103 (1.3.4-dev) - added ap_array_pstrcat() - * 19990105 (1.3.4-dev) - added ap_os_is_filename_valid() to Win32 + * 19990105 (1.3.4-dev) - added ap_os_is_filename_valid() * 19990106 (1.3.4-dev) - Move MODULE_MAGIC_COOKIE to the end of the *STANDARD_MODULE_STUFF macro so the version *numbers and file name remain at invariant offsets 1.260 +0 -21 apache-1.3/src/include/httpd.h Index: httpd.h === RCS file: /home/cvs/apache-1.3/src/include/httpd.h,v retrieving revision 1.259 retrieving revision 1.260 diff -u -r1.259 -r1.260 --- httpd.h 1999/01/08 17:54:39 1.259 +++ httpd.h 1999/01/08 20:08:21 1.260 @@ -1017,27 +1017,6 @@ API_EXPORT(int) ap_can_exec(const struct stat *); API_EXPORT(void) ap_chdir_file(const char *file); -#ifndef HAVE_CANONICAL_FILENAME -#define ap_os_canonical_filename(p,f) (f) -#define ap_os_case_canonical_filename(p,f) (f) -#define ap_os_systemcase_filename(p,f) (f) -#else -API_EXPORT(char *) ap_os_canonical_filename(pool *p, const char *file); -#ifdef WIN32 -API_EXPORT(char *) ap_os_case_canonical_filename(pool *pPool, const char *szFile); -API_EXPORT(char *) ap_os_systemcase_filename(pool *pPool, const char *szFile); -API_EXPORT(int) ap_os_is_filename_valid(const char *file); -#else -#define ap_os_case_canonical_filename(p,f) ap_os_canonical_filename(p,f) -#define ap_os_systemcase_filename(p,f) ap_os_canonical_filename(p,f) -#endif -#endif - -#ifdef _OSD_POSIX -extern const char *os_set_account(pool *p, const char *account); -extern int os_init_job_environment(server_rec *s, const char *user_name, int one_process); -#endif /* _OSD_POSIX */ - char *ap_get_local_host(pool *); unsigned long ap_get_virthost_addr(char *hostname, unsigned short *port); 1.143 +5 -11 apache-1.3/src/main/http_request.c Index: http_request.c === RCS file: /home/cvs/apache-1.3/src/main/http_request.c,v retrieving revision 1.142 retrieving revision 1.143 diff -u -r1.142 -r1.143 --- http_request.c1999/01/08 17:54:42 1.142 +++ http_request.c1999/01/08 20:08:23 1.143 @@ -229,11 +229,11 @@ *cp = '\0'; -#ifdef WIN32 -/* We must not stat() filenames such as /file/aux since it can cause - * delays or lockups. So pretend that they do not exist by returning - * an ENOENT error. This will force us to drop that part of the path and - * keep looking back for a real file that exists, while still allowing +/* We must not
cvs commit: apache-1.3/src/os/win32 os.h
fielding99/01/08 15:46:47 Modified:src CHANGES src/include httpd.h src/os/bs2000 os.h src/os/os2 os.h src/os/tpf os.h src/os/unix os.h src/os/win32 os.h Log: Revert most of my last commit. Only ap_os_is_filename_valid() can be moved to os.h, since the other prototypes depend on the pool typedef. Revision ChangesPath 1.1209+0 -6 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1208 retrieving revision 1.1209 diff -u -r1.1208 -r1.1209 --- CHANGES 1999/01/08 20:08:18 1.1208 +++ CHANGES 1999/01/08 23:46:39 1.1209 @@ -1,11 +1,5 @@ Changes with Apache 1.3.4 - *) Moved prototypes/defines for ap_os_canonical_filename(), - ap_os_case_canonical_filename(), ap_os_systemcase_filename(), and - ap_os_is_filename_valid() from httpd.h to the separate os.h files. - Moved BS2000-specific os_set_account() and os_init_job_environment() - prototypes to bs2000/os.h. [Roy Fielding] - *) Renamed macros status_drops_connection to ap_status_drops_connection and vestigial scan_script_header to ap_scan_script_header_err, mostly for aesthetic reasons. [Roy Fielding] 1.261 +23 -0 apache-1.3/src/include/httpd.h Index: httpd.h === RCS file: /home/cvs/apache-1.3/src/include/httpd.h,v retrieving revision 1.260 retrieving revision 1.261 diff -u -r1.260 -r1.261 --- httpd.h 1999/01/08 20:08:21 1.260 +++ httpd.h 1999/01/08 23:46:41 1.261 @@ -1017,6 +1017,29 @@ API_EXPORT(int) ap_can_exec(const struct stat *); API_EXPORT(void) ap_chdir_file(const char *file); +#ifndef HAVE_CANONICAL_FILENAME +/* + * We can't define these in os.h because of dependence on pool pointer. + */ +#define ap_os_canonical_filename(p,f) (f) +#define ap_os_case_canonical_filename(p,f) (f) +#define ap_os_systemcase_filename(p,f) (f) +#else +API_EXPORT(char *) ap_os_canonical_filename(pool *p, const char *file); +#ifdef WIN32 +API_EXPORT(char *) ap_os_case_canonical_filename(pool *pPool, const char *szFile); +API_EXPORT(char *) ap_os_systemcase_filename(pool *pPool, const char *szFile); +#else +#define ap_os_case_canonical_filename(p,f) ap_os_canonical_filename(p,f) +#define ap_os_systemcase_filename(p,f) ap_os_canonical_filename(p,f) +#endif +#endif + +#ifdef _OSD_POSIX +extern const char *os_set_account(pool *p, const char *account); +extern int os_init_job_environment(server_rec *s, const char *user_name, int one_process); +#endif /* _OSD_POSIX */ + char *ap_get_local_host(pool *); unsigned long ap_get_virthost_addr(char *hostname, unsigned short *port); 1.15 +0 -11 apache-1.3/src/os/bs2000/os.h Index: os.h === RCS file: /home/cvs/apache-1.3/src/os/bs2000/os.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- os.h 1999/01/08 20:08:25 1.14 +++ os.h 1999/01/08 23:46:43 1.15 @@ -31,18 +31,7 @@ /* Other ap_os_ routines not used by this platform */ -#define ap_os_canonical_filename(p,f) (f) -#define ap_os_case_canonical_filename(p,f) (f) -#define ap_os_systemcase_filename(p,f) (f) #define ap_os_is_filename_valid(f) (1) - -/* Routines in bs2login.c */ - -#ifdef _OSD_POSIX -extern const char *os_set_account(pool *p, const char *account); -extern int os_init_job_environment(server_rec *s, const char *user_name, - int one_process); -#endif /* Sorry if this is ugly, but the include order doesn't allow me * to use request_rec here... */ 1.11 +1 -7 apache-1.3/src/os/os2/os.h Index: os.h === RCS file: /home/cvs/apache-1.3/src/os/os2/os.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- os.h 1999/01/08 20:08:25 1.10 +++ os.h 1999/01/08 23:46:44 1.11 @@ -2,6 +2,7 @@ #define APACHE_OS_H #define PLATFORM OS/2 +#define HAVE_CANONICAL_FILENAME /* * This file in included in all Apache source code. It contains definitions @@ -26,13 +27,6 @@ */ extern int ap_os_is_path_absolute(const char *file); #endif - -/* Canonical Filename Routines */ - -API_EXPORT(char *) ap_os_canonical_filename(pool *p, const char *file); - -#define ap_os_case_canonical_filename(p,f) ap_os_canonical_filename(p,f) -#define ap_os_systemcase_filename(p,f) ap_os_canonical_filename(p,f) /* FIXME: the following should be implemented on
cvs commit: apache-1.3/src/os/win32 os.h util_win32.c
manoj 98/11/05 11:20:18
Modified:src CHANGES
src/include ap_config.h
src/os/win32 os.h util_win32.c
Log:
Work around incomplete implementation of strftime on Win32.
Revision ChangesPath
1.1134+3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1133
retrieving revision 1.1134
diff -u -u -r1.1133 -r1.1134
--- CHANGES 1998/11/04 22:23:42 1.1133
+++ CHANGES 1998/11/05 19:20:14 1.1134
@@ -1,5 +1,8 @@
Changes with Apache 1.3.4
+ *) Work around incomplete implementation of strftime on Win32.
+ [Manoj Kasichainula, Ken Parzygnat [EMAIL PROTECTED]]
+
*) Move a typedef to fix compile problems on Linux with 1.x kernels.
[Manoj Kasichainula] PR#3177
1.243 +3 -0 apache-1.3/src/include/ap_config.h
Index: ap_config.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/ap_config.h,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -u -r1.242 -r1.243
--- ap_config.h 1998/11/04 22:23:45 1.242
+++ ap_config.h 1998/11/05 19:20:16 1.243
@@ -938,6 +938,9 @@
#endif /* ndef WIN32 */
#include time.h/* for ctime */
+#ifdef WIN32
+#define strftime(s,max,format,tm) os_strftime(s,max,format,tm)
+#endif
#include signal.h
#include errno.h
#if !defined(QNX) !defined(CONVEXOS11) !defined(NEXT)
1.25 +2 -0 apache-1.3/src/os/win32/os.h
Index: os.h
===
RCS file: /export/home/cvs/apache-1.3/src/os/win32/os.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -u -r1.24 -r1.25
--- os.h 1998/09/19 12:27:25 1.24
+++ os.h 1998/11/05 19:20:17 1.25
@@ -93,6 +93,8 @@
#define stat(f,ps) os_stat(f,ps)
API_EXPORT(int) os_stat(const char *szPath,struct stat *pStat);
+API_EXPORT(int) os_strftime(char *s, size_t max, const char *format, const
struct tm *tm);
+
#define _spawnv(mode,cmdname,argv) os_spawnv(mode,cmdname,argv)
#define spawnv(mode,cmdname,argv)os_spawnv(mode,cmdname,argv)
API_EXPORT(int) os_spawnv(int mode,const char *cmdname,const char *const
*argv);
1.27 +69 -0 apache-1.3/src/os/win32/util_win32.c
Index: util_win32.c
===
RCS file: /export/home/cvs/apache-1.3/src/os/win32/util_win32.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -u -r1.26 -r1.27
--- util_win32.c 1998/10/01 04:52:32 1.26
+++ util_win32.c 1998/11/05 19:20:17 1.27
@@ -1,6 +1,8 @@
#include windows.h
#include sys/stat.h
#include stdarg.h
+#include time.h
+#include stdlib.h
#include httpd.h
#include http_log.h
@@ -415,4 +417,71 @@
va_end(vlist);
return _spawnve(mode, szCmd, aszArgs, aszEnv);
+}
+
+#undef strftime
+
+/* Partial replacement for strftime. This adds certain expandos to the
+ * Windows version
+ */
+
+API_EXPORT(int) os_strftime(char *s, size_t max, const char *format,
+const struct tm *tm) {
+ /* If the new format string is bigger than max, the result string probably
+* won't fit anyway. When %-expandos are added, made sure the padding
below
+* is enough.
+*/
+char *new_format = (char *) _alloca(max + 11);
+size_t i, j, format_length = strlen(format);
+int return_value;
+int length_written;
+
+for (i = 0, j = 0; (i format_length j max)) {
+if (format[i] != '%') {
+new_format[j++] = format[i++];
+continue;
+}
+switch (format[i+1]) {
+case 'D':
+/* Is this locale dependent? Shouldn't be...
+ Also note the year 2000 exposure here */
+memcpy(new_format + j, %m/%d/%y, 8);
+i += 2;
+j += 8;
+break;
+case 'r':
+memcpy(new_format + j, %I:%M:%S %p, 11);
+i += 2;
+j += 11;
+break;
+case 'T':
+memcpy(new_format + j, %H:%M:%S, 8);
+i += 2;
+j += 8;
+break;
+case 'e':
+length_written = ap_snprintf(new_format + j, max - j, %2d,
+tm-tm_mday);
+j = (length_written == -1) ? max : (j + length_written);
+i += 2;
+break;
+/* Handle %% to avoid dying on strftime(out, 600, 1200 %'s)
*/
+case '%':
+
cvs commit: apache-1.3/src/os/win32 os.h
rse 98/09/19 05:27:26 Modified:src/modules/standard mod_so.c src/os/win32 os.h Log: Fix DSO for Rapsody port: The ap_os_dso_init() was comitted but not the call for it inside mod_so.c. Additionally I assed an empty define for the WIN32 platform for consistency. Submitted by: Wilfredo Sanchez [EMAIL PROTECTED] Revision ChangesPath 1.26 +4 -0 apache-1.3/src/modules/standard/mod_so.c Index: mod_so.c === RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_so.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- mod_so.c 1998/05/06 15:18:02 1.25 +++ mod_so.c 1998/09/19 12:27:24 1.26 @@ -153,6 +153,10 @@ soc = (so_server_conf *)ap_pcalloc(p, sizeof(so_server_conf)); soc-loaded_modules = ap_make_array(p, DYNAMIC_MODULE_LIMIT, sizeof(moduleinfo)); +#ifndef NO_DLOPEN +ap_os_dso_init(); +#endif + return (void *)soc; } 1.24 +1 -0 apache-1.3/src/os/win32/os.h Index: os.h === RCS file: /export/home/cvs/apache-1.3/src/os/win32/os.h,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- os.h 1998/07/13 11:32:51 1.23 +++ os.h 1998/09/19 12:27:25 1.24 @@ -107,6 +107,7 @@ * These are used by mod_so.c */ #define ap_os_dso_handle_t HINSTANCE +#define ap_os_dso_init() #define ap_os_dso_load(l) LoadLibraryEx(l, NULL, LOAD_WITH_ALTERED_SEARCH_PATH) #define ap_os_dso_unload(l) FreeLibrary(l) #define ap_os_dso_sym(h,s) GetProcAddress(h,s)
cvs commit: apache-1.3/src/os/win32 os.h
rse 98/07/12 02:07:38 Modified:src/include conf.h src/os/bs2000 os.h src/os/emx os.h src/os/unix os.h src/os/win32 os.h Log: Make sure conf_auto.h is only included when available/generated. At least under the Win32 environment it is not available. Revision ChangesPath 1.222 +4 -2 apache-1.3/src/include/conf.h Index: conf.h === RCS file: /export/home/cvs/apache-1.3/src/include/conf.h,v retrieving revision 1.221 retrieving revision 1.222 diff -u -r1.221 -r1.222 --- conf.h1998/07/11 10:24:08 1.221 +++ conf.h1998/07/12 09:07:31 1.222 @@ -67,8 +67,6 @@ * See PORTING for a listing of what they mean */ -#include conf_auto.h - /* Have to include sys/stat.h before ../os/win32/os.h so we can override stat() properly */ #include sys/types.h @@ -80,6 +78,10 @@ #include ../os/win32/os.h #else #include os.h +#endif + +#ifdef HAVE_CONF_AUTO_H +#include conf_auto.h #endif #if !defined(QNX) !defined(MPE) !defined(WIN32) 1.9 +1 -0 apache-1.3/src/os/bs2000/os.h Index: os.h === RCS file: /export/home/cvs/apache-1.3/src/os/bs2000/os.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- os.h 1998/05/07 12:24:27 1.8 +++ os.h 1998/07/12 09:07:33 1.9 @@ -9,6 +9,7 @@ * and prototypes of OS specific functions defined in os.c or os-inline.c */ +#define HAVE_CONF_AUTO_H 1 #include conf.h #if !defined(INLINE) defined(USE_GNU_INLINE) 1.6 +2 -0 apache-1.3/src/os/emx/os.h Index: os.h === RCS file: /export/home/cvs/apache-1.3/src/os/emx/os.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- os.h 1998/05/07 12:24:28 1.5 +++ os.h 1998/07/12 09:07:34 1.6 @@ -9,6 +9,8 @@ * and prototypes of OS specific functions defined in os.c or os-inline.c */ +#define HAVE_CONF_AUTO_H 1 + #if defined(__GNUC__) !defined(INLINE) /* Compiler supports inline, so include the inlineable functions as * part of the header 1.28 +1 -0 apache-1.3/src/os/unix/os.h Index: os.h === RCS file: /export/home/cvs/apache-1.3/src/os/unix/os.h,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- os.h 1998/07/11 10:24:11 1.27 +++ os.h 1998/07/12 09:07:35 1.28 @@ -58,6 +58,7 @@ #ifndef APACHE_OS_H #define APACHE_OS_H +#define HAVE_CONF_AUTO_H 1 #include conf.h #define PLATFORM Unix 1.21 +5 -0 apache-1.3/src/os/win32/os.h Index: os.h === RCS file: /export/home/cvs/apache-1.3/src/os/win32/os.h,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- os.h 1998/07/11 10:24:11 1.20 +++ os.h 1998/07/12 09:07:36 1.21 @@ -9,6 +9,11 @@ * and prototypes of OS specific functions defined in os.c */ +/* under WIN32 we have no conf_auto.h */ +#undef HAVE_CONF_AUTO_H +/* but we provide some entries manually */ +#undef HAVE_UNISTD_H + /* temporarily replace crypt */ /* char *crypt(const char *pw, const char *salt); */ #define crypt(buf,salt) (buf)
cvs commit: apache-1.3/src/os/win32 os.h
coar98/05/07 05:24:31
Modified:.STATUS
htdocs/manual/mod core.html
src CHANGES buildmark.c
src/include http_conf_globals.h httpd.h
src/main http_core.c http_main.c
src/os/bs2000 os.h
src/os/emx os.h
src/os/unix os.h
src/os/win32 os.h
Log:
Add the core AddVersionComponent and AddVersionPlatform directives,
which make the SERVER_SUBVERSION functionality a runtime thing and
allow adding OS identity to the Server-Version string respectively.
PR: 2056
Reviewed by: Jim Jagielski, Martin Kraemer, Brian Behlendorf
Revision ChangesPath
1.381 +1 -7 apache-1.3/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.380
retrieving revision 1.381
diff -u -r1.380 -r1.381
--- STATUS1998/05/07 02:48:22 1.380
+++ STATUS1998/05/07 12:24:20 1.381
@@ -56,12 +56,6 @@
Available Patches:
-* Ken's Adding the OS Type Patch
- [EMAIL PROTECTED]
- Status: Ken +1, Jim +1 (with Brian's suggested changes),
- Martin +1, Brian +1 (change 'add_component' and
- 'add_platform' to something a bit more clear)
-
* Ed Korthof's patch to fix protocol issues surrounding 400, 408, and
414 responses.
[EMAIL PROTECTED]
@@ -132,7 +126,7 @@
(feb98 archives)
Jim: I thought that we decided default, although Ken
thought it ugly
- Ken: I just don't like using Add when reverting something; no -1
+ Ken: I just don't like using Add when reverting something; not a -1
* proxy_*_canon routines use r-proxyreq incorrectly. See
[EMAIL PROTECTED]
1.113 +101 -1apache-1.3/htdocs/manual/mod/core.html
Index: core.html
===
RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/core.html,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- core.html 1998/05/06 11:04:36 1.112
+++ core.html 1998/05/07 12:24:21 1.113
@@ -24,6 +24,8 @@
LIA HREF=#accessconfigAccessConfig/A
LIA HREF=#accessfilenameAccessFileName/A
LIA HREF=#addmoduleAddModule/A
+LIA HREF=#addversioncomponentAddVersionComponent/A
+LIA HREF=#addversionplatformAddVersionPlatform/A
LIA HREF=#allowoverrideAllowOverride/A
LIA HREF=#authnameAuthName/A
LIA HREF=#authtypeAuthType/A
@@ -178,6 +180,101 @@
be cleared with the A HREF=#clearmodulelistClearModuleList/A
directive.PHR
+H2A name=addversioncomponentAddVersionComponent directive/A/H2
+!--%plaintext lt;?INDEX {\tt AddVersionComponent} directivegt; --
+A
+ HREF=directive-dict.html#Syntax
+ REL=Help
+STRONGSyntax:/STRONG/A AddVersionComponent EMstring/EMBR
+A
+ HREF=directive-dict.html#Context
+ REL=Help
+STRONGContext:/STRONG/A server config BR
+A
+ HREF=directive-dict.html#Status
+ REL=Help
+STRONGStatus:/STRONG/A coreBR
+A
+ HREF=directive-dict.html#Compatibility
+ REL=Help
+STRONGCompatibility:/STRONG/A AddVersionComponent is only available
+ in Apache 1.3 and later
+
+P
+Use this directive to add a string to the SAMPServer-Version/SAMP
+response header field which is sent back to clients. This field identifies
+the server software as the Apache Web server, and can also list additional
+information. This directive may occur multiple times, and the results are
+cumulative. In each case the string should take one of the following forms:
+/P
+DL
+ DDCODEAddVersionComponent (some comment within parentheses)/CODE
+ DL
+ DDEMor/EM
+ /DD
+ /DL
+ CODEAddVersionComponent component-name/major.minor/CODE
+ /DD
+/DL
+P
+that is, the string should either be arbitrary text enclosed in parentheses,
+or else a specific component token and version number (such as mymod/1.0).
+/P
+P
+This setting applies to the entire server, and cannot be enabled or
+disabled on a virtualhost-by-virtualhost basis.
+/P
+P
+This directive replaces the SAMPSERVER_SUBVERSION/SAMP setting
+that was available in earlier versions of the Apache Web server.
+/PHR
+
+H2A name=addversionplatformAddVersionPlatform directive/A/H2
+!--%plaintext lt;?INDEX {\tt AddVersionPlatform} directivegt; --
+A
+ HREF=directive-dict.html#Syntax
+ REL=Help
+STRONGSyntax:/STRONG/A AddVersionPlatform EMOn|Off/EMBR
+A
+ HREF=directive-dict.html#Context
+ REL=Help
+STRONGContext:/STRONG/A server config BR
+A
+ HREF=directive-dict.html#Status
+ REL=Help
+STRONGStatus:/STRONG/A coreBR
+A
+ HREF=directive-dict.html#Compatibility
+ REL=Help
+STRONGCompatibility:/STRONG/A AddVersionPlatform is only available
+ in Apache 1.3
cvs commit: apache-1.3/src/os/win32 os.h util_win32.c
rse 98/04/13 11:05:21 Modified:src/include compat.h httpd.h src/main http_config.c http_core.c http_request.c util.c src/modules/standard mod_alias.c mod_autoindex.c mod_so.c mod_userdir.c src/os/bs2000 os-inline.c os.h src/os/emx os-inline.c os.h src/os/unix os-inline.c os.c os.h src/os/win32 os.h util_win32.c Log: Manually rename some symbols to again get the os-distinction which was lost in the big renaming procedure: ap_canonical_filename ap_os_canonical_filename ap_is_path_absolute ap_os_is_path_absolute ap_escape_path ap_os_escape_path ap_dso_handle_t ap_os_dso_handle_t ap_dso_error -- ap_os_dso_error ap_dso_sym ap_os_dso_sym ap_dso_unload ap_os_dso_unload ap_dso_load ap_os_dso_load Revision ChangesPath 1.3 +7 -7 apache-1.3/src/include/compat.h Index: compat.h === RCS file: /export/home/cvs/apache-1.3/src/include/compat.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- compat.h 1998/04/13 10:32:27 1.2 +++ compat.h 1998/04/13 18:05:09 1.3 @@ -208,9 +208,9 @@ #define open_logs ap_open_logs #define open_mutex ap_open_mutex #define open_piped_log ap_open_piped_log -#define os_canonical_filename ap_canonical_filename -#define os_escape_path ap_escape_path -#define os_is_path_absoluteap_is_path_absolute +#define os_canonical_filename ap_os_canonical_filename +#define os_escape_path ap_os_escape_path +#define os_is_path_absoluteap_os_is_path_absolute #define overlay_tables ap_overlay_tables #define palloc ap_palloc #define parseHTTPdate ap_parseHTTPdate @@ -389,9 +389,9 @@ #define util_uri_init ap_util_uri_init #define uudecode ap_uudecode #define vbprintf ap_vbprintf -#define os_dl_load ap_dso_load -#define os_dl_unload ap_dso_unload -#define os_dl_sym ap_dso_sym -#define os_dl_errorap_dso_error +#define os_dl_load ap_os_dso_load +#define os_dl_unload ap_os_dso_unload +#define os_dl_sym ap_os_dso_sym +#define os_dl_errorap_os_dso_error #endif /* APACHE_COMPAT_H */ 1.203 +4 -4 apache-1.3/src/include/httpd.h Index: httpd.h === RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v retrieving revision 1.202 retrieving revision 1.203 diff -u -r1.202 -r1.203 --- httpd.h 1998/04/11 12:00:22 1.202 +++ httpd.h 1998/04/13 18:05:09 1.203 @@ -843,8 +843,8 @@ API_EXPORT(void) ap_no2slash(char *name); API_EXPORT(void) ap_getparents(char *name); API_EXPORT(char *) ap_escape_path_segment(pool *p, const char *s); -API_EXPORT(char *) ap_escape_path(pool *p, const char *path, int partial); -#define escape_uri(ppool,path) ap_escape_path(ppool,path,1) +API_EXPORT(char *) ap_os_escape_path(pool *p, const char *path, int partial); +#define escape_uri(ppool,path) ap_os_escape_path(ppool,path,1) API_EXPORT(char *) ap_escape_html(pool *p, const char *s); API_EXPORT(char *) ap_construct_server(pool *p, const char *hostname, unsigned port, const request_rec *r); @@ -913,9 +913,9 @@ API_EXPORT(void) ap_chdir_file(const char *file); #ifndef HAVE_CANONICAL_FILENAME -#define ap_canonical_filename(p,f) (f) +#define ap_os_canonical_filename(p,f) (f) #else -API_EXPORT(char *) ap_canonical_filename(pool *p, const char *file); +API_EXPORT(char *) ap_os_canonical_filename(pool *p, const char *file); #endif char *ap_get_local_host(pool *); 1.114 +2 -2 apache-1.3/src/main/http_config.c Index: http_config.c === RCS file: /export/home/cvs/apache-1.3/src/main/http_config.c,v retrieving revision 1.113 retrieving revision 1.114 diff -u -r1.113 -r1.114 --- http_config.c 1998/04/11 12:00:28 1.113 +++ http_config.c 1998/04/13 18:05:10 1.114 @@ -983,7 +983,7 @@ so the server can be moved or mirrored with less pain. */ char *p; int offset = (int) (long) cmd-info; -if (ap_is_path_absolute(arg)) +if (ap_os_is_path_absolute(arg)) p = arg; else p = ap_make_full_path(cmd-pool, ap_server_root, arg); @@ -1001,7 +1001,7
cvs commit: apache-1.3/src/os/win32 os.h
dgaudet 98/02/13 19:08:01
Modified:src CHANGES
src/os/bs2000 os-inline.c os.h
src/os/emx os-inline.c os.h
src/os/unix os-inline.c os.h
src/os/win32 os.h
Log:
It's hard to use os_is_path_absolute() unless it takes a const char *.
Revision ChangesPath
1.628 +3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.627
retrieving revision 1.628
diff -u -r1.627 -r1.628
--- CHANGES 1998/02/14 01:02:05 1.627
+++ CHANGES 1998/02/14 03:07:53 1.628
@@ -1,5 +1,8 @@
Changes with Apache 1.3b6
+ *) os_is_path_absolute() now takes a const char * instead of a char *.
+ [Dean Gaudet]
+
Changes with Apache 1.3b5
*) Preserve the content encoding given by the AddEncoding directive
1.2 +1 -1 apache-1.3/src/os/bs2000/os-inline.c
Index: os-inline.c
===
RCS file: /export/home/cvs/apache-1.3/src/os/bs2000/os-inline.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- os-inline.c 1998/01/13 23:11:31 1.1
+++ os-inline.c 1998/02/14 03:07:55 1.2
@@ -24,7 +24,7 @@
#endif
-INLINE int os_is_path_absolute(char *file)
+INLINE int os_is_path_absolute(const char *file)
{
return (file file[0] == '/' ? 1 : 0);
}
1.4 +1 -1 apache-1.3/src/os/bs2000/os.h
Index: os.h
===
RCS file: /export/home/cvs/apache-1.3/src/os/bs2000/os.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- os.h 1998/01/31 23:52:49 1.3
+++ os.h 1998/02/14 03:07:55 1.4
@@ -20,7 +20,7 @@
/* Compiler does not support inline, so prototype the inlineable functions
* as normal
*/
-extern int os_is_path_absolute(char *f);
+extern int os_is_path_absolute(const char *f);
#endif
/* Sorry if this is ugly, but the include order doesn't allow me
1.2 +1 -1 apache-1.3/src/os/emx/os-inline.c
Index: os-inline.c
===
RCS file: /export/home/cvs/apache-1.3/src/os/emx/os-inline.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- os-inline.c 1997/11/05 12:48:22 1.1
+++ os-inline.c 1998/02/14 03:07:56 1.2
@@ -24,7 +24,7 @@
#endif
-INLINE int os_is_path_absolute(char *file)
+INLINE int os_is_path_absolute(const char *file)
{
/* For now, just do the same check that http_request.c and mod_alias.c
* do.
1.2 +1 -1 apache-1.3/src/os/emx/os.h
Index: os.h
===
RCS file: /export/home/cvs/apache-1.3/src/os/emx/os.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- os.h 1997/11/05 12:48:23 1.1
+++ os.h 1998/02/14 03:07:57 1.2
@@ -16,7 +16,7 @@
/* Compiler does not support inline, so prototype the inlineable functions
* as normal
*/
-extern int os_is_path_absolute(char *f);
+extern int os_is_path_absolute(const char *f);
#endif
/* OS/2 doesn't have symlinks so S_ISLNK is always false */
1.3 +1 -1 apache-1.3/src/os/unix/os-inline.c
Index: os-inline.c
===
RCS file: /export/home/cvs/apache-1.3/src/os/unix/os-inline.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- os-inline.c 1997/12/26 15:08:13 1.2
+++ os-inline.c 1998/02/14 03:07:58 1.3
@@ -24,7 +24,7 @@
#endif
-INLINE int os_is_path_absolute(char *file)
+INLINE int os_is_path_absolute(const char *file)
{
return file[0] == '/';
}
1.5 +1 -1 apache-1.3/src/os/unix/os.h
Index: os.h
===
RCS file: /export/home/cvs/apache-1.3/src/os/unix/os.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- os.h 1997/10/07 05:53:42 1.4
+++ os.h 1998/02/14 03:07:58 1.5
@@ -16,5 +16,5 @@
/* Compiler does not support inline, so prototype the inlineable functions
* as normal
*/
-extern int os_is_path_absolute(char *f);
+extern int os_is_path_absolute(const char *f);
#endif
1.12 +1 -1 apache-1.3/src/os/win32/os.h
Index: os.h
===
RCS file: /export/home/cvs/apache-1.3/src/os/win32/os.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- os.h
