cvs commit: apache-1.3/conf mime.types
dgaudet 99/04/20 16:19:36 Modified:conf mime.types Log: add .xls (flame away) PR: 3935 Revision ChangesPath 1.24 +1 -1 apache-1.3/conf/mime.types Index: mime.types === RCS file: /home/cvs/apache-1.3/conf/mime.types,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- mime.types1999/03/14 23:58:59 1.23 +++ mime.types1999/04/20 23:19:33 1.24 @@ -117,7 +117,7 @@ application/vnd.mitsubishi.misty-guard.trustweb application/vnd.ms-artgalry application/vnd.ms-asf -application/vnd.ms-excel +application/vnd.ms-excel xls application/vnd.ms-powerpointppt application/vnd.ms-project application/vnd.ms-tnef
cvs commit: apache-1.3/src/main http_request.c
dgaudet 99/04/20 16:38:45 Modified:src CHANGES src/main http_request.c Log: copy expecting_100 when doing an internal redirect PR: 3910 Submitted by: Jose KAHAN [EMAIL PROTECTED] Revision ChangesPath 1.1316+3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1315 retrieving revision 1.1316 diff -u -r1.1315 -r1.1316 --- CHANGES 1999/04/20 21:53:22 1.1315 +++ CHANGES 1999/04/20 23:38:41 1.1316 @@ -1,5 +1,8 @@ Changes with Apache 1.3.7 + *) The 100 Continue response wasn't being sent after internal + redirects. [Jose KAHAN [EMAIL PROTECTED]] PR#3910 + *) When padding the name with spaces for display, mod_autoindex would count , , and in their escaped width, messing up the display. [Dean Gaudet] PR#4075 1.147 +1 -0 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.146 retrieving revision 1.147 diff -u -r1.146 -r1.147 --- http_request.c1999/03/07 15:05:36 1.146 +++ http_request.c1999/04/20 23:38:44 1.147 @@ -1309,6 +1309,7 @@ new-htaccess= r-htaccess; new-no_cache= r-no_cache; +new-expecting_100= r-expecting_100; new-no_local_copy = r-no_local_copy; new-read_length = r-read_length; /* We can only read it once */ new-vlist_validator = r-vlist_validator;
cvs commit: apache-1.3/src CHANGES
dgaudet 99/04/20 18:29:21 Modified:src CHANGES Log: a few more PRs Revision ChangesPath 1.1317+1 -1 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1316 retrieving revision 1.1317 diff -u -r1.1316 -r1.1317 --- CHANGES 1999/04/20 23:38:41 1.1316 +++ CHANGES 1999/04/21 01:29:17 1.1317 @@ -1,7 +1,7 @@ Changes with Apache 1.3.7 *) The 100 Continue response wasn't being sent after internal - redirects. [Jose KAHAN [EMAIL PROTECTED]] PR#3910 + redirects. [Jose KAHAN [EMAIL PROTECTED]] PR#3910, 3806, 3575 *) When padding the name with spaces for display, mod_autoindex would count , , and in their escaped width, messing up the display.
cvs commit: apache-1.3/src/modules/standard mod_autoindex.c
dgaudet 99/04/20 19:00:57
Modified:src CHANGES
src/modules/standard mod_autoindex.c
Log:
we don't need padding when we're not doing fancyindexing
PR: 3770
Submitted by: [EMAIL PROTECTED]
Revision ChangesPath
1.1318+3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1317
retrieving revision 1.1318
diff -u -r1.1317 -r1.1318
--- CHANGES 1999/04/21 01:29:17 1.1317
+++ CHANGES 1999/04/21 02:00:48 1.1318
@@ -1,5 +1,8 @@
Changes with Apache 1.3.7
+ *) IndexOptions None generated extra spaces at the end of each
+ line. [EMAIL PROTECTED] PR#3770
+
*) The 100 Continue response wasn't being sent after internal
redirects. [Jose KAHAN [EMAIL PROTECTED]] PR#3910, 3806, 3575
1.103 +1 -1 apache-1.3/src/modules/standard/mod_autoindex.c
Index: mod_autoindex.c
===
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_autoindex.c,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- mod_autoindex.c 1999/04/20 21:53:25 1.102
+++ mod_autoindex.c 1999/04/21 02:00:55 1.103
@@ -1198,7 +1198,7 @@
}
else {
ap_rvputs(r, LIA HREF=\, anchor, \ , t2,
- /A, pad_scratch + strlen(t2), NULL);
+ /A, NULL);
}
ap_rputc('\n', r);
}
cvs commit: apache-1.3/src/modules/standard mod_mime_magic.c
dgaudet 99/04/20 20:42:35
Modified:src CHANGES
src/modules/standard mod_mime_magic.c
Log:
uncompress and gzip don't like getting only 4k of the file... pass them
the entire file (but we still only read 4k, so they don't get to run
for long).
PR: 4097
Submitted by: Marcin Cieslak [EMAIL PROTECTED]
Revision ChangesPath
1.1319+7 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1318
retrieving revision 1.1319
diff -u -r1.1318 -r1.1319
--- CHANGES 1999/04/21 02:00:48 1.1318
+++ CHANGES 1999/04/21 03:42:31 1.1319
@@ -1,5 +1,12 @@
Changes with Apache 1.3.7
+ *) mod_mime_magic passed only the first 4k of a file to
+ uncompress/gzip, but those tools sometimes do not produce
+ any output unless a sufficient portion of the compressed
+ file is input. Change to pass the entire file -- but
+ only read 4k of output.
+ [Marcin Cieslak [EMAIL PROTECTED]] PR#4097
+
*) IndexOptions None generated extra spaces at the end of each
line. [EMAIL PROTECTED] PR#3770
1.39 +27 -21apache-1.3/src/modules/standard/mod_mime_magic.c
Index: mod_mime_magic.c
===
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_mime_magic.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- mod_mime_magic.c 1999/01/01 19:05:11 1.38
+++ mod_mime_magic.c 1999/04/21 03:42:33 1.39
@@ -242,7 +242,7 @@
static int ascmagic(request_rec *, unsigned char *, int);
static int is_tar(unsigned char *, int);
static int softmagic(request_rec *, unsigned char *, int);
-static void tryit(request_rec *, unsigned char *, int);
+static void tryit(request_rec *, unsigned char *, int, int);
static int zmagic(request_rec *, unsigned char *, int);
static int getvalue(server_rec *, struct magic *, char **);
@@ -256,7 +256,7 @@
static int mcheck(request_rec *, union VALUETYPE *, struct magic *);
static void mprint(request_rec *, union VALUETYPE *, struct magic *);
-static int uncompress(request_rec *, int, const unsigned char *,
+static int uncompress(request_rec *, int,
unsigned char **, int);
static long from_oct(int, char *);
static int fsmagic(request_rec *r, const char *fn);
@@ -887,7 +887,7 @@
magic_rsl_puts(r, MIME_TEXT_UNKNOWN);
else {
buf[nbytes++] = '\0'; /* null-terminate it */
- tryit(r, buf, nbytes);
+ tryit(r, buf, nbytes, 1);
}
(void) ap_pclosef(r-pool, fd);
@@ -897,13 +897,15 @@
}
-static void tryit(request_rec *r, unsigned char *buf, int nb)
+static void tryit(request_rec *r, unsigned char *buf, int nb, int
checkzmagic)
{
/*
* Try compression stuff
*/
-if (zmagic(r, buf, nb) == 1)
- return;
+ if (checkzmagic == 1) {
+ if (zmagic(r, buf, nb) == 1)
+ return;
+ }
/*
* try tests in /etc/magic (or surrogate magic file)
@@ -2082,9 +2084,13 @@
char *encoding; /* MUST be lowercase */
} compr[] = {
+/* we use gzip here rather than uncompress because we have to pass
+ * it a full filename -- and uncompress only considers filenames
+ * ending with .Z
+ */
{
\037\235, 2, {
- uncompress, -c, NULL
+ gzip, -dcq, NULL
}, 0, x-compress
},
{
@@ -2121,8 +2127,8 @@
if (i == ncompr)
return 0;
-if ((newsize = uncompress(r, i, buf, newbuf, nbytes)) 0) {
- tryit(r, newbuf, newsize);
+if ((newsize = uncompress(r, i, newbuf, nbytes)) 0) {
+ tryit(r, newbuf, newsize, 0);
/* set encoding type in the request record */
r-content_encoding = compr[i].encoding;
@@ -2139,6 +2145,13 @@
static int uncompress_child(void *data, child_info *pinfo)
{
struct uncompress_parms *parm = data;
+ char *new_argv[4];
+
+ new_argv[0] = compr[parm-method].argv[0];
+ new_argv[1] = compr[parm-method].argv[1];
+ new_argv[2] = parm-r-filename;
+ new_argv[3] = NULL;
+
#if defined(WIN32)
int child_pid;
#endif
@@ -2149,10 +2162,10 @@
#if defined(WIN32)
child_pid = spawnvp(compr[parm-method].argv[0],
- compr[parm-method].argv);
+ new_argv);
return (child_pid);
#else
-execvp(compr[parm-method].argv[0], compr[parm-method].argv);
+execvp(compr[parm-method].argv[0], new_argv);
ap_log_rerror(APLOG_MARK, APLOG_ERR, parm-r,
MODNAME : could not execute `%s'.,
compr[parm-method].argv[0]);
@@
cvs commit: apache-1.3/src CHANGES
dgaudet 99/04/20 20:50:41 Modified:src CHANGES Log: another PR# Revision ChangesPath 1.1320+1 -1 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1319 retrieving revision 1.1320 diff -u -r1.1319 -r1.1320 --- CHANGES 1999/04/21 03:42:31 1.1319 +++ CHANGES 1999/04/21 03:50:36 1.1320 @@ -15,7 +15,7 @@ *) When padding the name with spaces for display, mod_autoindex would count , , and in their escaped width, messing up the display. - [Dean Gaudet] PR#4075 + [Dean Gaudet] PR#4075, 3758 *) PORT: fixed a compilation problem on NEXT. [Jacques Distler [EMAIL PROTECTED]] PR#4130
cvs commit: apache-1.3/htdocs/manual/misc howto.html
dgaudet 99/04/20 22:01:25 Modified:htdocs/manual/misc howto.html Log: missing / in example PR: 3631 Submitted by: Sebastian Andersson [EMAIL PROTECTED] Revision ChangesPath 1.11 +1 -1 apache-1.3/htdocs/manual/misc/howto.html Index: howto.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/misc/howto.html,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- howto.html1998/10/23 15:14:14 1.10 +++ howto.html1999/04/21 05:01:24 1.11 @@ -77,7 +77,7 @@ PHere's how to redirect all requests to a script... In the server configuration file, -BLOCKQUOTEPREScriptAlias / /usr/local/httpd/cgi-bin/redirect_script/PRE +BLOCKQUOTEPREScriptAlias / /usr/local/httpd/cgi-bin/redirect_script//PRE /BLOCKQUOTE and here's a simple perl script to redirect requests:
cvs commit: apache-1.3 configure
dgaudet 99/04/21 00:21:04
Modified:.configure
Log:
fix typo
PR: 4282
Submitted by: Philippe M.Chiasson [EMAIL PROTECTED]
Revision ChangesPath
1.83 +1 -1 apache-1.3/configure
Index: configure
===
RCS file: /home/cvs/apache-1.3/configure,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- configure 1999/04/20 18:19:14 1.82
+++ configure 1999/04/21 07:21:03 1.83
@@ -780,7 +780,7 @@
module )
case $apc_optarg in
all )
- OOIFS=$IFSr
+ OOIFS=$IFS
IFS=':'
for module in $modules; do
eval module_${module}=no
cvs commit: apache-1.3/src CHANGES
jim 99/04/21 06:20:48 Modified:.Makefile.tmpl src CHANGES Log: PR:4260 Submitted by: Maria Verina [EMAIL PROTECTED] APACI would not correctly build suexec due to an extra '\' Revision ChangesPath 1.72 +1 -2 apache-1.3/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- Makefile.tmpl 1999/04/20 16:19:57 1.71 +++ Makefile.tmpl 1999/04/21 13:20:46 1.72 @@ -189,8 +189,7 @@ -DUSERDIR_SUFFIX=\$(suexec_userdir)\ \ -DLOG_EXEC=\$(suexec_logexec)\ \ -DDOC_ROOT=\$(suexec_docroot)\ \ - -DSAFE_PATH=\$(suexec_safepath)\ \ - ' \ + -DSAFE_PATH=\$(suexec_safepath)\ ' \ suexec; \ fi; \ echo === $(SRC)/support 1.1321+3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1320 retrieving revision 1.1321 diff -u -r1.1320 -r1.1321 --- CHANGES 1999/04/21 03:50:36 1.1320 +++ CHANGES 1999/04/21 13:20:47 1.1321 @@ -1,5 +1,8 @@ Changes with Apache 1.3.7 + *) APACI would not correctly build suexec. [Maria Verina + [EMAIL PROTECTED]] PR#4260 + *) mod_mime_magic passed only the first 4k of a file to uncompress/gzip, but those tools sometimes do not produce any output unless a sufficient portion of the compressed
cvs commit: apache-apr/docs networkio.txt
rbb 99/04/21 06:56:09
Modified:apr/network_io/unix select.c sockets.c
apr/test Makefile
include apr_network_io.h
docs networkio.txt
Log:
Fixes for network I/O logic, so it works porperly. I'm sure there will be
more of these.
Revision ChangesPath
1.2 +2 -1 apache-apr/apr/network_io/unix/select.c
Index: select.c
===
RCS file: /home/cvs/apache-apr/apr/network_io/unix/select.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- select.c 1999/04/14 19:17:21 1.1
+++ select.c 1999/04/21 13:56:06 1.2
@@ -58,10 +58,11 @@
#include errno.h
#include sys/time.h
#include sys/types.h
+#include unistd.h
void apr_sd_set(apr_socket_t *sock, apr_sd_set_t *sd_set)
{
-FDSET(sock-socketdes, sd_set);
+FD_SET(sock-socketdes, sd_set);
}
void apr_sd_clr(apr_socket_t *sock, apr_sd_set_t *sd_set)
1.7 +18 -20apache-apr/apr/network_io/unix/sockets.c
Index: sockets.c
===
RCS file: /home/cvs/apache-apr/apr/network_io/unix/sockets.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sockets.c 1999/04/19 14:16:41 1.6
+++ sockets.c 1999/04/21 13:56:06 1.7
@@ -71,9 +71,8 @@
thesocket-addr = (struct sockaddr_in *)malloc(sizeof(struct
sockaddr_in));
thesocket-addr-sin_family = AF_INET;
-thesocket-addr-sin_addr.s_addr = INADDR_ANY;
-thesocket-addr_len = sizeof(thesocket-addr);
+thesocket-addr_len = sizeof(*thesocket-addr);
if (thesocket-socketdes 0) {
free(thesocket-addr);
@@ -116,6 +115,7 @@
apr_status_t apr_bind(apr_socket_t *sock)
{
+sock-addr-sin_addr.s_addr = INADDR_ANY;
if (bind(sock-socketdes, (struct sockaddr *)sock-addr, sock-addr_len)
== -1)
return APR_FAILURE;
else
@@ -149,36 +149,34 @@
return NULL;
}
-apr_socket_t * apr_connect(char *hostname, unsigned short port)
+apr_status_t apr_connect(apr_socket_t *sock, char *hostname, unsigned short
port)
{
-apr_socket_t *new = (apr_socket_t *)malloc(sizeof(apr_socket_t));
struct hostent *hp;
hp = gethostbyname(hostname);
-new-socketdes = socket(AF_INET, SOCK_STREAM, 0);
-new-addr = (struct sockaddr_in *)malloc (sizeof (struct sockaddr_in));
-if ((new-socketdes 0) || (!hp) || (!new-addr)) {
-free(new-addr);
-free(new);
-return NULL;
+if ((sock-socketdes 0) || (!hp) || (!sock-addr)) {
+free(sock-addr);
+free(sock);
+return APR_FAILURE;
}
-memcpy((char *)new-addr-sin_addr, hp-h_addr_list[0], hp-h_length);
+memcpy((char *)sock-addr-sin_addr, hp-h_addr_list[0], hp-h_length);
-new-addr-sin_port = htons((short)port);
-new-addr-sin_family = AF_INET;
+sock-addr-sin_port = htons((short)port);
+sock-addr-sin_family = AF_INET;
-new-addr_len = sizeof(new-addr);
+sock-addr_len = sizeof(*sock-addr);
-if (connect(new-socketdes, new-addr, new-addr_len) 0) {
-free(new-addr);
-free(new);
-return NULL;
+if ((connect(sock-socketdes, sock-addr, sock-addr_len) 0)
+(errno != EINPROGRESS)) {
+free(sock-addr);
+free(sock);
+return APR_FAILURE;
}
else {
-new-remote_hostname = strdup(hostname);
-return new;
+sock-remote_hostname = strdup(hostname);
+return APR_SUCCESS;
}
}
1.3 +8 -4 apache-apr/apr/test/Makefile
Index: Makefile
===
RCS file: /home/cvs/apache-apr/apr/test/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile 1999/04/12 17:54:11 1.2
+++ Makefile 1999/04/21 13:56:07 1.3
@@ -12,12 +12,12 @@
SRCDIR=..
EXTRA_CFLAGS=-g
EXTRA_LDFLAGS=
-EXTRA_LIBS= -L../file_io -lfile
+EXTRA_LIBS= -L../file_io -lfile -L../network_io -lnetwork
EXTRA_INCLUDES=
EXTRA_DEPS=
OSDIR=
INCDIR=../../include
-INCLUDES0=-I ../file_io/unix -I $(INCDIR)
+INCLUDES0=-I ../file_io/unix -I ../network_io/unix -I $(INCDIR)
SHELL=/bin/sh
CC=gcc
CPP=gcc -E
@@ -45,14 +45,19 @@
INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
-OBJS= testfile.o \
+OBJS= testfile.o ab_apr.o\
.c.o:
$(CC) -c $(INCLUDES) $(CFLAGS) $(LIBS) $
+all:
+ testfile ab_apr
+
testfile:
$(CC) testfile.c $(INCLUDES) $(CFLAGS) $(LIBS) $
+ab_apr:
+ $(CC) ab_apr.c $(INCLUDES) $(CFLAGS) $(LIBS) -o ab_apr $
clean:
rm
cvs commit: apache-apr/apr/test ab_apr.c
rbb 99/04/21 06:58:58 Added: apr/test ab_apr.c Log: First test program for network I/O. It's actually ab ported to use apr. When apr calms down a bit, this should be moved to src/support, but for right now, we are using it as a test program. Submitted by: David Reid and Ryan Bloom Revision ChangesPath 1.1 apache-apr/apr/test/ab_apr.c Index: ab_apr.c === /* * Copyright (c) 1998-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/. * */ /* ** This program is based on ZeusBench V1.0 written by Adam Twiss ** which is Copyright (c) 1996 by Zeus Technology Ltd. http://www.zeustech.net/ ** ** This software is provided as is and any express or implied waranties, ** including but not limited to, the implied warranties of merchantability and ** fitness for a particular purpose are disclaimed. In no event shall ** Zeus Technology Ltd. be liable for any direct, indirect, incidental, special, ** exemplary, or consequential damaged (including, but not limited to, ** procurement of substitute good or services; loss of use, data, or profits; ** or business interruption) however caused and on 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. ** */ /* ** HISTORY: **- Originally written by Adam Twiss [EMAIL PROTECTED], March 1996 ** with input from Mike Belshe [EMAIL PROTECTED] and ** Michael Campanella [EMAIL PROTECTED] **- Enhanced by Dean Gaudet [EMAIL PROTECTED], November 1997 **- Cleaned up by Ralf S. Engelschall [EMAIL PROTECTED], March 1998 **- POST and verbosity by Kurt Sussman [EMAIL PROTECTED], August 1998 **- HTML table output added by David N. Welton [EMAIL PROTECTED], January 1999 ** */ /* * BUGS: * * - uses strcpy/etc. * - has various
cvs commit: apache-1.3/src CHANGES
rse 99/04/21 07:28:12 Modified:.Makefile.tmpl src CHANGES Log: Fix the ownership delegation for proxy directory under `make install'. This now uses the same check as APACI's configure but is a install-time decision and not a configure-time decision (which can be especially important for package maintainers). Revision ChangesPath 1.73 +6 -2 apache-1.3/Makefile.tmpl Index: Makefile.tmpl === RCS file: /home/cvs/apache-1.3/Makefile.tmpl,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- Makefile.tmpl 1999/04/21 13:20:46 1.72 +++ Makefile.tmpl 1999/04/21 14:28:01 1.73 @@ -256,8 +256,12 @@ $(MKDIR) $(root)$(runtimedir) $(MKDIR) $(root)$(logfiledir) $(MKDIR) $(root)$(proxycachedir) - -chown $(conf_user) $(root)$(proxycachedir) - -chgrp $(conf_group) $(root)$(proxycachedir) + [EMAIL PROTECTED] [ .`id | grep root` != . ]; then \ + echo chown $(conf_user) $(root)$(proxycachedir); \ + chown $(conf_user) $(root)$(proxycachedir); \ + echo chgrp $(conf_group) $(root)$(proxycachedir); \ + chgrp $(conf_group) $(root)$(proxycachedir); \ + fi @echo === [mktree] # install the server program and optionally corresponding 1.1322+3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1321 retrieving revision 1.1322 diff -u -r1.1321 -r1.1322 --- CHANGES 1999/04/21 13:20:47 1.1321 +++ CHANGES 1999/04/21 14:28:08 1.1322 @@ -1,5 +1,8 @@ Changes with Apache 1.3.7 + *) Fix the ownership delegation for proxy directory under `make install'. + [Ralf S. Engelschall] + *) APACI would not correctly build suexec. [Maria Verina [EMAIL PROTECTED]] PR#4260
cvs commit: apache-1.3/src/helpers GuessOS PrintPath TestCompile buildinfo.sh checkheader.sh findcpp.sh fmn.sh mkshadow.sh ppl.sh slo.sh
jim 99/04/21 07:30:35 Modified:src/helpers GuessOS PrintPath TestCompile buildinfo.sh checkheader.sh findcpp.sh fmn.sh mkshadow.sh ppl.sh slo.sh Log: Change 'Written by' to 'Initially written by' per the group consensus Revision ChangesPath 1.59 +2 -0 apache-1.3/src/helpers/GuessOS Index: GuessOS === RCS file: /export/home/cvs/apache-1.3/src/helpers/GuessOS,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- GuessOS 1999/03/30 06:19:17 1.58 +++ GuessOS 1999/04/21 14:30:25 1.59 @@ -7,6 +7,8 @@ # addition: Any changes or additions to this script should be # Emailed to the Apache group ([EMAIL PROTECTED]). # +# Initially written by Jim Jagielski for the Apache configuration mechanism +# # Be as similar to the output of config.guess/config.sub # as possible. 1.18 +3 -0 apache-1.3/src/helpers/PrintPath Index: PrintPath === RCS file: /export/home/cvs/apache-1.3/src/helpers/PrintPath,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- PrintPath 1999/02/07 23:26:51 1.17 +++ PrintPath 1999/04/21 14:30:26 1.18 @@ -10,6 +10,9 @@ # Usage: # PrintPath [-s] [-pPATHNAME] program [program ...] # +# Initially written by Jim Jagielski for the Apache configuration mechanism +# (with kudos to Kernighan/Pike) +# # This script falls under the Apache License. # See http://www.apache.org/docs/LICENSE 1.26 +2 -0 apache-1.3/src/helpers/TestCompile Index: TestCompile === RCS file: /export/home/cvs/apache-1.3/src/helpers/TestCompile,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- TestCompile 1999/02/07 23:26:51 1.25 +++ TestCompile 1999/04/21 14:30:26 1.26 @@ -32,6 +32,8 @@ # located) if you want to test it out. Configure must # also call it as './helpers/TestCompile' # +# Initially written by Jim Jagielski for the Apache configuration mechanism +# # This script falls under the Apache License. # See http://www.apache.org/docs/LICENSE 1.8 +1 -1 apache-1.3/src/helpers/buildinfo.sh Index: buildinfo.sh === RCS file: /export/home/cvs/apache-1.3/src/helpers/buildinfo.sh,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- buildinfo.sh 1999/02/07 23:26:52 1.7 +++ buildinfo.sh 1999/04/21 14:30:26 1.8 @@ -1,7 +1,7 @@ #!/bin/sh ## ## buildinfo.sh -- Determine Build Information -## Written by Ralf S. Engelschall [EMAIL PROTECTED] +## Initially written by Ralf S. Engelschall [EMAIL PROTECTED] ## for the Apache's Autoconf-style Interface (APACI) ## # 1.6 +2 -1 apache-1.3/src/helpers/checkheader.sh Index: checkheader.sh === RCS file: /export/home/cvs/apache-1.3/src/helpers/checkheader.sh,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- checkheader.sh1999/01/16 22:00:47 1.5 +++ checkheader.sh1999/04/21 14:30:27 1.6 @@ -1,7 +1,8 @@ #!/bin/sh ## ## checkheader.sh -- Check whether a C header file exists -## Written by Ralf S. Engelschall for the Apache configuration mechanism +## Initially written by Ralf S. Engelschall for the Apache +## configuration mechanism ## # # This script falls under the Apache License. 1.7 +2 -1 apache-1.3/src/helpers/findcpp.sh Index: findcpp.sh === RCS file: /export/home/cvs/apache-1.3/src/helpers/findcpp.sh,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- findcpp.sh1999/01/16 22:00:47 1.6 +++ findcpp.sh1999/04/21 14:30:28 1.7 @@ -1,7 +1,8 @@ #!/bin/sh ## ## findcpp.sh -- Find out how to _directly_ run the C Pre-Processor (CPP) -## Written by Ralf S. Engelschall for the Apache configuration mechanism +## Initially written by Ralf S. Engelschall for the Apache configuration +## mechanism ## # # This script falls under the Apache License. 1.6 +1 -2 apache-1.3/src/helpers/fmn.sh Index: fmn.sh === RCS file: /export/home/cvs/apache-1.3/src/helpers/fmn.sh,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- fmn.sh1999/01/16 22:00:47 1.5 +++ fmn.sh1999/04/21 14:30:29 1.6 @@ -2,8 +2,7 @@
cvs commit: apache-1.3/src/helpers mkshadow.sh
jim 99/04/21 07:32:30 Modified:src/helpers mkshadow.sh Log: typo :) Revision ChangesPath 1.9 +1 -1 apache-1.3/src/helpers/mkshadow.sh Index: mkshadow.sh === RCS file: /export/home/cvs/apache-1.3/src/helpers/mkshadow.sh,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- mkshadow.sh 1999/04/21 14:30:31 1.8 +++ mkshadow.sh 1999/04/21 14:32:29 1.9 @@ -2,7 +2,7 @@ ## ## mkshadow.sh -- create a shadow tree ## -## Initialy written by Ralf S. Engelschall [EMAIL PROTECTED] +## Initially written by Ralf S. Engelschall [EMAIL PROTECTED] ## for the shadow tree generation option (--shadow) of ## Apache's Autoconf-style Interface (APACI) ##
cvs commit: apache-1.3 configure
rse 99/04/21 07:49:00
Modified:.configure
Log:
Various source cleanups to APACI's configure script, especially to finish the
.X - xX transition (o my nice dots... :) where Jim has forgotten some
instances when he converted the source in the past...
Revision ChangesPath
1.84 +21 -14apache-1.3/configure
Index: configure
===
RCS file: /home/cvs/apache-1.3/configure,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- configure 1999/04/21 07:21:03 1.83
+++ configure 1999/04/21 14:48:58 1.84
@@ -87,12 +87,19 @@
quiet=no
verbose=no
case $* in
---help|*--help|*--help* ) help=yes; quiet=yes
- echo hang on a moment, generating help
- ;;
---quiet|*--quiet|*--quiet* ) quiet=yes ;;
---verbose|*--verbose|*--verbose*|-v|*-v|*-v* ) verbose=yes ;;
-* ) ;;
+--help|*--help|*--help* )
+help=yes; quiet=yes
+echo [hang on a moment, generating help]
+echo
+;;
+--quiet|*--quiet|*--quiet* )
+quiet=yes
+;;
+--verbose|*--verbose|*--verbose*|-v|*-v|*-v* )
+verbose=yes
+;;
+* )
+;;
esac
##
@@ -159,7 +166,7 @@
fi
##
-## Look for a good tar. If we don't find 'GNU tar' then make
+## Look for a good Tar. If we don't find 'GNU tar' then make
## sure ours can handle the '-h' (don't copy symlink, copy
## the actual data) option.
##
@@ -245,10 +252,10 @@
for module in `egrep '^[#]*(Add|Shared)Module' $src/Configuration.tmpl`;
do
add=yes
share=no
-if [ .`echo $module | grep '^#'` != . ]; then
+if [ x`echo $module | grep '^#'` != x ]; then
add=no
fi
-if [ .`echo $module | grep 'SharedModule'` != . ]; then
+if [ x`echo $module | grep 'SharedModule'` != x ]; then
share=yes
fi
module=`echo $module |\
@@ -498,7 +505,7 @@
# Makefile is for platform bootstrapping, so don't hardcode
paths)
gnutriple=`$aux/GuessOS | sed -e 's:/:-:g' | awk '{
printf(%s,$1); }'`
# create Makefile wrapper (the first time only)
-if [ .`ls $top/src.* 2/dev/null` = . ]; then
+if [ x`ls $top/src.* 2/dev/null` = x ]; then
if [ x$quiet = xno ]; then
echo + creating Makefile (shadow wrapper)
fi
@@ -598,7 +605,7 @@
;;
--add-module=*)
file=$apc_optarg
-if [ .`echo $file | egrep
'/?mod_[a-zA-Z0-9][a-zA-Z0-9_]*\.c$'` = . ]; then
+if [ x`echo $file | egrep
'/?mod_[a-zA-Z0-9][a-zA-Z0-9_]*\.c$'` = x ]; then
echo configure:Error: Module filename doesn't match
'/?mod_[a-zA-Z0-9][a-zA-Z0-9_]*\.c' 12
exit 1
fi
@@ -946,7 +953,7 @@
echo and htdocs/manual/suexec.html documents
first.
exit 1
fi
-if [ .`id | grep root` = . ]; then
+if [ x`id | grep root` = x ]; then
echo + Warning: You enabled the suEXEC feature. Be aware that you
need 12
echo + root privileges for this, at the latest at the installation
step. 12
fi
@@ -962,7 +969,7 @@
## target name
##
if [ x$TARGET != x ]; then
-thetarget=$TARGET
+thetarget=$TARGET
else
thetarget=httpd
fi
@@ -1040,7 +1047,7 @@
break
fi
done
-if [ .`id | grep root` = . ]; then
+if [ x`id | grep root` = x ]; then
conf_port=8080
fi
conf_serveradmin=`$aux/buildinfo.sh -n [EMAIL PROTECTED]
cvs commit: apache-1.3/src/main http_main.c
rse 99/04/21 11:08:07
Modified:src/main http_main.c
Log:
Fix a recently introduced warning:
| : make
| gcc -c -I../os/unix -I../include -funsigned-char -DTARGET=\apache\
-pipe
| -O -pedantic -Wall -Wshadow -Wpointer-arith -Wcast-align
-Wmissing-prototypes
| -Wmissing-declarations -Wnested-externs -Winline `../apaci` http_main.c
| http_main.c:3485: warning: no previous prototype for `common_init'
I've checked it and it looks like a mistake from a recent commit, because
commot_init() is still a locally used function only:
| : aps grep common_init
| === main/http_main.c
| static void common_init(void)
| common_init();
| common_init();
| common_init();
Feel free to complain and reverse this again, but then please fix it in
addition to a prototype somewhere in the header files or at least at the start
of http_main.c, of course.
Revision ChangesPath
1.431 +1 -1 apache-1.3/src/main/http_main.c
Index: http_main.c
===
RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v
retrieving revision 1.430
retrieving revision 1.431
diff -u -r1.430 -r1.431
--- http_main.c 1999/04/20 19:15:39 1.430
+++ http_main.c 1999/04/21 18:08:05 1.431
@@ -3481,7 +3481,7 @@
* some of it is #ifdef'd but was duplicated before anyhow. This stuff
* is still a mess.
*/
-void common_init(void)
+static void common_init(void)
{
INIT_SIGLIST()
#ifdef AUX3
cvs commit: apache-1.3/src/main util.c
rse 99/04/21 11:25:45
Modified:src/main util.c
Log:
Remove another warning:
| : make
| gcc -c -I../os/unix -I../include -funsigned-char -DTARGET=\apache\
-pipe
| -O -pedantic -Wall -Wshadow -Wpointer-arith -Wcast-align
-Wmissing-prototypes
| -Wmissing-declarations -Wnested-externs -Winline `../apaci` util.c
| util.c: In function `ap_size_list_item':
| util.c:1028: warning: pointer targets in assignment differ in signedness
| util.c:1037: warning: pointer targets in assignment differ in signedness
This was caused because the involved function first does a ``const unsigned
char *ptr = (const unsigned char *)*field;'' for various reasons but later
didn't the cast again when assigning back ptr to *field. Perhaps the function
can be rewritten to not use casts at all (Ben?). But at least as long as the
first import cast is done we also need the two export casts to make the
compilers quiet.
VS: --
Revision ChangesPath
1.160 +2 -2 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.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- util.c1999/04/17 22:07:59 1.159
+++ util.c1999/04/21 18:25:44 1.160
@@ -1025,7 +1025,7 @@
}
if ((*len = (ptr - token)) == 0) {
-*field = ptr;
+*field = (const char *)ptr;
return NULL;
}
@@ -1034,7 +1034,7 @@
while (*ptr == ',' || ap_isspace(*ptr))
++ptr;
-*field = ptr;
+*field = (const char *)ptr;
return (const char *)token;
}
cvs commit: apache-1.3/src/helpers getuid.sh
jim 99/04/21 12:24:53
Added: src/helpers getuid.sh
Log:
Add the getuid.sh helper... Worked on
all OSs I had access to and tried disabling 'id' to exercise the
'whoami' and 'who am i' stuff with success. YMMV. Test and patch :)
Revision ChangesPath
1.1 apache-1.3/src/helpers/getuid.sh
Index: getuid.sh
===
#!/bin/sh
# Return the uid of the process being run. If we cannot
# determine what it is, return '?'.
#
# Initially written by Jim Jagielski for the Apache configuration mechanism
#
# This script falls under the Apache License.
# See http://www.apache.org/docs/LICENSE
# First we try 'id'
if AP_IDPATH=`./src/helpers/PrintPath id` ; then
# See if it's a POSIX 'id'
if AP_RETVAL=`$AP_IDPATH -u 2/dev/null` ; then
echo $AP_RETVAL
exit 0
else
AP_RETVAL=`$AP_IDPATH | \
sed -e 's/^.*uid=//' | \
sed -e 's/[ ]*(.*$//'`
echo $AP_RETVAL
exit 0
fi
fi
#
# Ugg. Now we have to grab the login name of the process, and
# scan /etc/passwd.
#
# Try 'whoami' first, then 'who am i' (making sure to strip away
# the who crud) and finally just copy $LOGNAME
#
if AP_WHOAMI=`./src/helpers/PrintPath whoami` ; then
AP_LOGNAME=`$AP_WHOAMI`
else
if AP_LOGNAME=`who am i | sed -e 's/[ ]*.*$//'` ; then
:
else
AP_LOGNAME=$LOGNAME
fi
fi
#
# See if we have a valid login name.
#
if [ x$AP_LOGNAME = x ]; then
echo ?
exit 1
fi
#
# Ok, now we scan through /etc/passwd
#
AP_RETVAL=`egrep \^${AP_LOGNAME}: /etc/passwd | \
sed -e 's/[^:]*:[^:]*://' | \
sed -e 's/:.*$//'`
if [ x$AP_RETVAL = x ]; then
echo ?
exit 1
else
echo $AP_RETVAL
exit 0
fi
cvs commit: apache-1.3/src/helpers getuid.sh
jim 99/04/21 12:27:47 Modified:src/helpers getuid.sh Log: Sorry... forgot this little patch Revision ChangesPath 1.2 +1 -1 apache-1.3/src/helpers/getuid.sh Index: getuid.sh === RCS file: /export/home/cvs/apache-1.3/src/helpers/getuid.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- getuid.sh 1999/04/21 19:24:52 1.1 +++ getuid.sh 1999/04/21 19:27:46 1.2 @@ -32,7 +32,7 @@ if AP_WHOAMI=`./src/helpers/PrintPath whoami` ; then AP_LOGNAME=`$AP_WHOAMI` else -if AP_LOGNAME=`who am i | sed -e 's/[]*.*$//'` ; then +if AP_LOGNAME=`who am i | tail -1 | sed -e 's/[ ]*.*$//'` ; then : else AP_LOGNAME=$LOGNAME
cvs commit: apache-1.3/src/helpers getuid.sh
jim 99/04/21 12:37:17 Modified:src/helpers getuid.sh Log: Sorry again... The output of 'who' is most non-consistant :) Revision ChangesPath 1.3 +1 -1 apache-1.3/src/helpers/getuid.sh Index: getuid.sh === RCS file: /export/home/cvs/apache-1.3/src/helpers/getuid.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- getuid.sh 1999/04/21 19:27:46 1.2 +++ getuid.sh 1999/04/21 19:37:17 1.3 @@ -32,7 +32,7 @@ if AP_WHOAMI=`./src/helpers/PrintPath whoami` ; then AP_LOGNAME=`$AP_WHOAMI` else -if AP_LOGNAME=`who am i | tail -1 | sed -e 's/[ ]*.*$//'` ; then +if AP_LOGNAME=`who am i | tail -1 | sed -e 's/[ ][ ]*.*$//'` ; then : else AP_LOGNAME=$LOGNAME
cvs commit: apache-1.3 configure
jim 99/04/21 12:52:40 Modified:.configure Log: Use the new getuid.sh script Revision ChangesPath 1.85 +2 -2 apache-1.3/configure Index: configure === RCS file: /export/home/cvs/apache-1.3/configure,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- configure 1999/04/21 14:48:58 1.84 +++ configure 1999/04/21 19:52:39 1.85 @@ -953,7 +953,7 @@ echo and htdocs/manual/suexec.html documents first. exit 1 fi -if [ x`id | grep root` = x ]; then +if [ x`src/helpers/getuid.sh != x0 ]; then echo + Warning: You enabled the suEXEC feature. Be aware that you need 12 echo + root privileges for this, at the latest at the installation step. 12 fi @@ -1047,7 +1047,7 @@ break fi done -if [ x`id | grep root` = x ]; then +if [ x`src/helpers/getuid.sh != x0 ]; then conf_port=8080 fi conf_serveradmin=`$aux/buildinfo.sh -n [EMAIL PROTECTED]
cvs commit: apache-1.3 Makefile.tmpl
jim 99/04/21 12:57:14 Modified:.Makefile.tmpl Log: Now use it in Makefile.tmpl. Should we also wrap the 'chown's down by the suxec area?? Revision ChangesPath 1.74 +1 -1 apache-1.3/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- Makefile.tmpl 1999/04/21 14:28:01 1.73 +++ Makefile.tmpl 1999/04/21 19:57:12 1.74 @@ -256,7 +256,7 @@ $(MKDIR) $(root)$(runtimedir) $(MKDIR) $(root)$(logfiledir) $(MKDIR) $(root)$(proxycachedir) - [EMAIL PROTECTED] [ .`id | grep root` != . ]; then \ + [EMAIL PROTECTED] [ x`src/helpers/getuid.sh = x0 ]; then \ echo chown $(conf_user) $(root)$(proxycachedir); \ chown $(conf_user) $(root)$(proxycachedir); \ echo chgrp $(conf_group) $(root)$(proxycachedir); \
