cvs commit: apache-1.3/src/support htdigest.c
wsanchez00/01/25 20:36:55 Modified:src/support htdigest.c Log: BeOS uses sys/signal.h. Submitted by: David Reid [EMAIL PROTECTED] Revision ChangesPath 1.29 +1 -1 apache-1.3/src/support/htdigest.c Index: htdigest.c === RCS file: /home/cvs/apache-1.3/src/support/htdigest.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- htdigest.c1999/12/09 17:19:48 1.28 +++ htdigest.c2000/01/26 04:36:53 1.29 @@ -72,7 +72,7 @@ #endif #include ap.h #include ap_md5.h -#if defined(MPE) || defined(QNX) || defined(WIN32) || defined(__TANDEM) || defined(OS390) +#if defined(MPE) || defined(QNX) || defined(WIN32) || defined(__TANDEM) || defined(OS390) || defined(BEOS) #include signal.h #else #include sys/signal.h
cvs commit: apache-1.3/src/support htdigest.c htpasswd.c
stoddard99/10/21 13:46:38 Modified:src/ap ap_checkpass.c ap_getpass.c ap_snprintf.c src/include ap_config.h http_conf_globals.h httpd.h multithread.h scoreboard.h src/main alloc.c buff.c http_core.c http_log.c http_main.c http_request.c util.c util_script.c src/modules/proxy mod_proxy.c proxy_cache.c proxy_util.c src/modules/standard mod_auth_anon.c mod_cern_meta.c mod_cgi.c mod_digest.c mod_expires.c mod_headers.c mod_include.c mod_info.c mod_rewrite.c mod_rewrite.h mod_speling.c mod_status.c mod_userdir.c mod_usertrack.c src/support htdigest.c htpasswd.c Log: Apache port to Netware 5 Submitted by: Mike Gardiner Reviewed by: Bill Stoddard Revision ChangesPath 1.6 +1 -1 apache-1.3/src/ap/ap_checkpass.c Index: ap_checkpass.c === RCS file: /home/cvs/apache-1.3/src/ap/ap_checkpass.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ap_checkpass.c1999/09/01 04:29:00 1.5 +++ ap_checkpass.c1999/10/21 20:44:07 1.6 @@ -97,7 +97,7 @@ /* * It's not our algorithm, so feed it to crypt() if possible. */ -#ifdef WIN32 +#if defined(WIN32) || defined(NETWARE) /* * On Windows, the only alternative to our MD5 algorithm is plain * text. 1.2 +3 -1 apache-1.3/src/ap/ap_getpass.c Index: ap_getpass.c === RCS file: /home/cvs/apache-1.3/src/ap/ap_getpass.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ap_getpass.c 1999/05/31 17:09:30 1.1 +++ ap_getpass.c 1999/10/21 20:44:09 1.2 @@ -62,7 +62,9 @@ */ #include ap_config.h +#ifndef NETWARE #include sys/types.h +#endif #include errno.h #include ap.h @@ -104,7 +106,7 @@ #endif -#ifdef WIN32 +#if defined(WIN32) || defined(NETWARE) /* * Windows lacks getpass(). So we'll re-implement it here. */ 1.37 +3 -1 apache-1.3/src/ap/ap_snprintf.c Index: ap_snprintf.c === RCS file: /home/cvs/apache-1.3/src/ap/ap_snprintf.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- ap_snprintf.c 1999/09/02 16:27:26 1.36 +++ ap_snprintf.c 1999/10/21 20:44:10 1.37 @@ -62,7 +62,9 @@ #include stdio.h #include ctype.h +#ifndef NETWARE #include sys/types.h +#endif #include stdarg.h #include string.h #include stdlib.h @@ -130,7 +132,7 @@ register int r2; double fi, fj; register char *p, *p1; - + if (ndigits = NDIG - 1) ndigits = NDIG - 2; r2 = 0; 1.271 +41 -5 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.270 retrieving revision 1.271 diff -u -r1.270 -r1.271 --- ap_config.h 1999/09/13 13:32:40 1.270 +++ ap_config.h 1999/10/21 20:44:15 1.271 @@ -72,7 +72,7 @@ /* * Support for platform dependent autogenerated defines */ -#ifndef WIN32 +#if !defined(WIN32) !defined(NETWARE) #include ap_config_auto.h #else /* not available under WIN32, so provide important entries manually */ @@ -81,9 +81,12 @@ /* Have to include sys/stat.h before ../os/win32/os.h so we can override stat() properly */ +#ifndef NETWARE #include sys/types.h +#endif #include sys/stat.h + /* So that we can use inline on some critical functions, and use * GNUC attributes (such as to get -Wall warnings for printf-like * functions). Only do this in gcc 2.7 or later ... it may work @@ -113,7 +116,7 @@ #include os.h #endif -#if !defined(QNX) !defined(MPE) !defined(WIN32) !defined(TPF) +#if !defined(QNX) !defined(MPE) !defined(WIN32) !defined(TPF) !defined(NETWARE) #include sys/param.h #endif @@ -950,6 +953,9 @@ #define NEED_INITGROUPS #define NO_SLACK +#elif defined(NETWARE) +#define USE_HSREGEX +/* Most all NetWare stuff is in os/NetWare/os.h */ #else /* Unknown system - Edit these to match */ #ifdef BSD @@ -1017,7 +1023,9 @@ * file. If you have neither, I'm confused. */ +#ifndef NETWARE #include sys/types.h +#endif #include stdarg.h #if !defined(NEXT) !defined(WIN32) @@ -1037,10 +1045,10 @@ #include strings.h #endif #include ap_ctype.h -#if !defined(MPE) !defined(WIN32) !defined(TPF) !defined(__TANDEM) +#if
cvs commit: apache-1.3/src/support htdigest.c
dirkx 99/08/02 03:45:38
Modified:src Configure
src/helpers GuessOS
src/include ap_config.h
src/main util.c
src/modules/proxy proxy_cache.c
src/modules/standard mod_rewrite.h
src/support htdigest.c
Log:
Folded in Ottati, Michael [EMAIL PROTECTED] patches
for compaq/tandem. At this moment in time it is unclear if this
is just a one-off effort, or that there is some long term future.
But given the limited scope/quirks of the OS this might well be
a non issue.
Submitted by: Ottati, Michael [EMAIL PROTECTED]
Reviewed by: dirkx
PR: 4804
Revision ChangesPath
1.365 +5 -0 apache-1.3/src/Configure
Index: Configure
===
RCS file: /x3/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.364
retrieving revision 1.365
diff -u -r1.364 -r1.365
--- Configure 1999/07/29 22:58:10 1.364
+++ Configure 1999/08/02 10:45:29 1.365
@@ -740,6 +740,11 @@
CC='cc'
RANLIB='true'
;;
+*-tandem-oss)
+ OS='Tandem OSS'
+ CFLAGS=-D_TANDEM_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -g
+ CC='c89'
+ ;;
*) # default: Catch systems we don't know about
OS='Unknown and unsupported OS'
echo Sorry, but we cannot grok \$PLAT\
1.62 +4 -0 apache-1.3/src/helpers/GuessOS
Index: GuessOS
===
RCS file: /x3/home/cvs/apache-1.3/src/helpers/GuessOS,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- GuessOS 1999/07/30 05:14:08 1.61
+++ GuessOS 1999/08/02 10:45:30 1.62
@@ -150,6 +150,10 @@
echo ${MACHINE}-dec-osf; exit 0
;;
+ NONSTOP_KERNEL:*:*:*)
+ echo ${MACHINE}-tandem-oss; exit 0;
+ ;;
+
QNX:*)
if [ $VERSION -gt 422 ]; then
echo ${MACHINE}-qssl-qnx32
1.265 +10 -1 apache-1.3/src/include/ap_config.h
Index: ap_config.h
===
RCS file: /x3/home/cvs/apache-1.3/src/include/ap_config.h,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -r1.264 -r1.265
--- ap_config.h 1999/07/30 20:58:56 1.264
+++ ap_config.h 1999/08/02 10:45:31 1.265
@@ -922,6 +922,12 @@
#undef offsetof
#define offsetof(s_type,field) ((size_t)(((s_type*)0)-field))
+#elif defined(__TANDEM)
+#define NO_WRITEV
+#define NO_KILLPG
+#define NEED_INITGROUPS
+#define NO_SLACK
+
#else
/* Unknown system - Edit these to match */
#ifdef BSD
@@ -1005,8 +1011,11 @@
#include stdio.h
#include stdlib.h
#include string.h
+#ifdef __TANDEM
+#include strings.h
+#endif
#include ap_ctype.h
-#if !defined(MPE) !defined(WIN32) !defined(TPF)
+#if !defined(MPE) !defined(WIN32) !defined(TPF) !defined(__TANDEM)
#include sys/file.h
#endif
#ifndef WIN32
1.168 +1 -1 apache-1.3/src/main/util.c
Index: util.c
===
RCS file: /x3/home/cvs/apache-1.3/src/main/util.c,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- util.c1999/07/29 18:13:45 1.167
+++ util.c1999/08/02 10:45:32 1.168
@@ -1746,7 +1746,7 @@
#ifdef NEED_INITGROUPS
int initgroups(const char *name, gid_t basegid)
{
-#if defined(QNX) || defined(MPE) || defined(BEOS) || defined(_OSD_POSIX) ||
defined(TPF)
+#if defined(QNX) || defined(MPE) || defined(BEOS) || defined(_OSD_POSIX) ||
defined(TPF) || defined(__TANDEM)
/* QNX, MPE and BeOS do not appear to support supplementary groups. */
return 0;
#else /* ndef QNX */
1.62 +6 -0 apache-1.3/src/modules/proxy/proxy_cache.c
Index: proxy_cache.c
===
RCS file: /x3/home/cvs/apache-1.3/src/modules/proxy/proxy_cache.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- proxy_cache.c 1999/06/10 05:18:08 1.61
+++ proxy_cache.c 1999/08/02 10:45:33 1.62
@@ -69,6 +69,10 @@
#endif /* WIN32 */
#include multithread.h
#include ap_md5.h
+#ifdef __TANDEM
+#include sys/types.h
+#include sys/stat.h
+#endif
DEF_Explain
@@ -1140,6 +1144,8 @@
*p = '\0';
#ifdef WIN32
if (mkdir(c-filename) 0 errno != EEXIST)
+#elif defined(__TANDEM)
+ if (mkdir(c-filename, S_IRWXU | S_IRWXG | S_IRWXO) 0 errno !=
EEXIST)
#else
if (mkdir(c-filename, S_IREAD | S_IWRITE | S_IEXEC) 0 errno
!= EEXIST)
#endif /* WIN32 */
1.64 +1 -1 apache-1.3/src/modules/standard/mod_rewrite.h
Index: mod_rewrite.h
cvs commit: apache-1.3/src/support htdigest.c htpasswd.c
coar99/05/31 12:44:31
Modified:src/support htdigest.c htpasswd.c
Log:
Use the ap_getpass() wrapper rather than reinventing it.
Revision ChangesPath
1.23 +68 -12apache-1.3/src/support/htdigest.c
Index: htdigest.c
===
RCS file: /home/cvs/apache-1.3/src/support/htdigest.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- htdigest.c1999/04/09 12:57:06 1.22
+++ htdigest.c1999/05/31 19:44:30 1.23
@@ -1,3 +1,59 @@
+/*
+ * 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/.
+ *
+ */
/**
**
* NOTE! This program is not safe as a setuid executable! Do not make it
@@ -17,6 +73,7 @@
#else
#include sys/signal.h
#endif
+#include ap.h
#include ap_md5.h
#ifdef CHARSET_EBCDIC
@@ -31,15 +88,6 @@
char *tn;
-static char *strd(char *s)
-{
-char *d;
-
-d = (char *) malloc(strlen(s) + 1);
-strcpy(d, s);
-return (d);
-}
-
static void getword(char *word, char *line, char stop)
{
int x = 0, y;
@@ -89,15 +137,23 @@
AP_MD5_CTX context;
unsigned char digest[16];
char string[MAX_STRING_LEN];
+char pwin[MAX_STRING_LEN];
+char pwv[MAX_STRING_LEN];
unsigned int i;
-pw = strd((char *) getpass(New password:));
-if (strcmp(pw, (char *) getpass(Re-type new password:))) {
+if (ap_getpass(New password: , pwin, sizeof(pwin)) != 0) {
+ fprintf(stderr, password too long);
+ exit(5);
+}
+ap_getpass(Re-type new password: , pwv, sizeof(pwv));
+if (strcmp(pwin, pwv) != 0) {
fprintf(stderr, They don't match, sorry.\n);
- if (tn)
+ if (tn) {
unlink(tn);
+ }
exit(1);
}
+pw = pwin;
fprintf(f, %s:%s:,
cvs commit: apache-1.3/src/support htdigest.c
randy 99/01/17 14:30:31 Modified:src/support htdigest.c Log: Portability for QNX 4.24. Revision ChangesPath 1.21 +1 -1 apache-1.3/src/support/htdigest.c Index: htdigest.c === RCS file: /home/cvs/apache-1.3/src/support/htdigest.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- htdigest.c1999/01/12 22:34:57 1.20 +++ htdigest.c1999/01/17 22:30:31 1.21 @@ -12,7 +12,7 @@ #include ap_config.h #include sys/types.h -#ifdef MPE +#if defined(MPE) || defined(QNX) #include signal.h #else #include sys/signal.h
cvs commit: apache-1.3/src/support htdigest.c rotatelogs.c
rse 98/08/03 02:15:35 Modified:src CHANGES Configure src/include ap_config.h httpd.h src/main alloc.c http_core.c http_log.c http_main.c http_protocol.c http_request.c util.c util_script.c src/modules/proxy proxy_cache.c src/modules/standard mod_cgi.c mod_include.c mod_log_agent.c mod_log_config.c mod_log_referer.c mod_rewrite.c mod_status.c mod_userdir.c src/support htdigest.c rotatelogs.c Removed: src/os/emx .cvsignore Makefile.tmpl os-inline.c os.c os.h util_os2.c Log: Renamed __EMX__ (internal define of the gcc port under OS/2) to OS2 following the same idea as MSVC vs WIN32. Additionally the src/os/emx/ directory was renamed to src/os/os2/ for consistency. Background information: 1. The src/os/os2/ stuff was created by a repository copy so we're both keep the history and sill be able to checkout older Apache releases. 2. The __EMX__ check in ap_config.h was replaced by a OS2 check while src/Configure now sets CFLAGS to -DOS ... Same is done for the Unix platforms, so make no difference here just for OS2. 3. The src/os/os2 is now also references from within src/Configure to reflect the change. Submitted by: Brian Havard Reviewed by: Martin Kraemer, Ralf S. Engelschall Finalized, cleaned up and applied by: Ralf S. Engelschall Revision ChangesPath 1.998 +5 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.997 retrieving revision 1.998 diff -u -r1.997 -r1.998 --- CHANGES 1998/08/03 08:44:03 1.997 +++ CHANGES 1998/08/03 09:14:41 1.998 @@ -1,5 +1,10 @@ Changes with Apache 1.3.2 + *) Renamed __EMX__ (internal define of the gcc port under OS/2) to OS2 + following the same idea as MSVC vs WIN32. Additionally the src/os/emx/ + directory was renamed to src/os/os2/ for consistency. + [Brian Havard, Ralf S. Engelschall] + *) Add new Rule SHARED_CHAIN which can be used to enable linking of DSO files (here modules) against other DSO files (here shared libraries). This is done by determining a subset of LIBS which can be safely used for 1.282 +2 -2 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.281 retrieving revision 1.282 diff -u -r1.281 -r1.282 --- Configure 1998/08/03 08:44:04 1.281 +++ Configure 1998/08/03 09:14:44 1.282 @@ -342,10 +342,10 @@ DEF_WANTHSREGEX=yes ;; *OS/2*) - OSDIR=os/emx + OSDIR=os/os2 DEF_WANTHSREGEX=yes OS='EMX OS/2' - CFLAGS=$CFLAGS -Zbsd-signals -Zbin-files -DTCPIPV4 -g + CFLAGS=$CFLAGS -DOS2 -Zbsd-signals -Zbin-files -DTCPIPV4 -g LDFLAGS=$LDFLAGS -Zexe LIBS=$LIBS -lsocket -lufc -lbsd DBM_LIB=-lgdbm 1.230 +2 -2 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.229 retrieving revision 1.230 diff -u -r1.229 -r1.230 --- ap_config.h 1998/07/21 15:03:06 1.229 +++ ap_config.h 1998/08/03 09:14:47 1.230 @@ -655,7 +655,7 @@ #define USE_MMAP_FILES #define HAVE_SYSLOG 1 -#elif defined(__EMX__) +#elif defined(OS2) /* Defines required for EMX OS/2 port. */ #define NO_KILLPG #define NEED_STRCASECMP @@ -907,7 +907,7 @@ #endif #endif #ifdef USE_MMAP_SCOREBOARD -#if !defined(__EMX__) !defined(WIN32) +#if !defined(OS2) !defined(WIN32) /* This file is not needed for OS/2 */ #include sys/mman.h #endif 1.229 +7 -7 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.228 retrieving revision 1.229 diff -u -r1.228 -r1.229 --- httpd.h 1998/07/18 23:35:40 1.228 +++ httpd.h 1998/08/03 09:14:48 1.229 @@ -79,7 +79,7 @@ * file with a relative pathname will have this added. */ #ifndef HTTPD_ROOT -#ifdef __EMX__ +#ifdef OS2 /* Set default for OS/2 file system */ #define HTTPD_ROOT /os2httpd #elif defined(WIN32) @@ -94,7 +94,7 @@ * directive. */ #ifndef DOCUMENT_LOCATION -#ifdef __EMX__ +#ifdef OS2 /* Set default for OS/2 file system */ #define DOCUMENT_LOCATION HTTPD_ROOT /docs #else @@ -144,7 +144,7 @@ /* The name of the log files */ #ifndef
