cvs commit: apache/src/helpers GuessOS
jim 96/12/11 05:48:59
Modified:src Configure
src/helpers GuessOS
Log:
Added SINIX OS
Revision ChangesPath
1.56 +6 -0 apache/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.55
retrieving revision 1.56
diff -C3 -r1.55 -r1.56
*** Configure 1996/12/10 23:43:25 1.55
--- Configure 1996/12/11 13:48:57 1.56
***
*** 296,301
--- 296,307
CFLAGS=$CFLAGS -DUW
LIBS=$LIBS -lsocket -lnsl -lcrypt
;;
+ *-sni-sysv4*)
+ OS='SVR4'
+ CFLAGS=$CFLAGS -DSVR4
+ DEF_WANTHSREGEX=yes
+ LIBS=$LIBS -lsocket -lnsl -lc
+ ;;
*-sysv4*)
OS='SVR4'
CFLAGS=$CFLAGS -DSVR4
1.11 +1 -1 apache/src/helpers/GuessOS
Index: GuessOS
===
RCS file: /export/home/cvs/apache/src/helpers/GuessOS,v
retrieving revision 1.10
retrieving revision 1.11
diff -C3 -r1.10 -r1.11
*** GuessOS 1996/12/09 05:00:49 1.10
--- GuessOS 1996/12/11 13:48:59 1.11
***
*** 159,165
;;
SINIX*)
! echo ${MACHINE}-whatever-sysv4; exit 0
;;
library:*)
--- 159,165
;;
SINIX*)
! echo ${MACHINE}-sni-sysv4; exit 0
;;
library:*)
cvs commit: apache/src http_protocol.h http_protocol.c
brian 96/12/11 16:28:03
Modified:src http_protocol.h http_protocol.c
Log:
Reviewed by: Randy Terbush, Rob Hartill, Brian Behlendorf
Submitted by: Doug MacEachern
Added rwrite() function for mod_perl, among others.
Revision ChangesPath
1.15 +1 -0 apache/src/http_protocol.h
Index: http_protocol.h
===
RCS file: /export/home/cvs/apache/src/http_protocol.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C3 -r1.14 -r1.15
*** http_protocol.h 1996/12/01 20:28:32 1.14
--- http_protocol.h 1996/12/12 00:27:58 1.15
***
*** 112,117
--- 112,118
int rputc (int c, request_rec *r);
int rputs(const char *str, request_rec *r);
+ int rwrite(const void *buf, int nbyte, request_rec *r);
int rvputs(request_rec *r, ...);
int rprintf(request_rec *r,const char *fmt,...);
1.82 +9 -0 apache/src/http_protocol.c
Index: http_protocol.c
===
RCS file: /export/home/cvs/apache/src/http_protocol.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -C3 -r1.81 -r1.82
*** http_protocol.c 1996/12/06 17:12:13 1.81
--- http_protocol.c 1996/12/12 00:27:59 1.82
***
*** 1379,1384
--- 1379,1393
return bputs(str, r-connection-client);
}
+ int rwrite(const void *buf, int nbyte, request_rec *r)
+ {
+ int n;
+ if (r-connection-aborted) return EOF;
+ n=bwrite(r-connection-client, buf, nbyte);
+ SET_BYTES_SENT(r);
+ return n;
+ }
+
int rprintf(request_rec *r,const char *fmt,...)
{
va_list vlist;
cvs commit: apache/src Configure
brian 96/12/11 16:30:38 Modified:src Configure Log: Submitted by: Colin Burgess [EMAIL PROTECTED] QNX needs Apache's regex libs. Revision ChangesPath 1.57 +2 -1 apache/src/Configure Index: Configure === RCS file: /export/home/cvs/apache/src/Configure,v retrieving revision 1.56 retrieving revision 1.57 diff -C3 -r1.56 -r1.57 *** Configure 1996/12/11 13:48:57 1.56 --- Configure 1996/12/12 00:30:37 1.57 *** *** 245,259 CFLAGS=$CFLAGS -DOSF1 ;; *-qnx) - DEF_WANTHSREGEX=yes OS='QNX' CFLAGS=$CFLAGS -DQNX LIBS=$LIBS -N128k -lsocket ;; *-qnx32) OS='QNX32' CFLAGS=$CFLAGS -DQNX -mf -3 LIBS=$LIBS -N128k -lsocket ;; *-sco3*) OS='SCO 3' --- 245,260 CFLAGS=$CFLAGS -DOSF1 ;; *-qnx) OS='QNX' CFLAGS=$CFLAGS -DQNX LIBS=$LIBS -N128k -lsocket + DEF_WANTHSREGEX=yes ;; *-qnx32) OS='QNX32' CFLAGS=$CFLAGS -DQNX -mf -3 LIBS=$LIBS -N128k -lsocket + DEF_WANTHSREGEX=yes ;; *-sco3*) OS='SCO 3'
cvs commit: apache/src mod_rewrite.c mod_rewrite.h
brian 96/12/11 16:36:12
Modified:src mod_rewrite.c mod_rewrite.h
Log:
Submitted by: [EMAIL PROTECTED]
bring mod_rewrite up to 2.3.9:
Patchlevel 8 (961211):
o Incorporated the const changes of the Apache Group to 2.3.5
into this release. But in a way to be backward compatible to Apache
1.1.1.
o Made gmtoff usage again workable in both 1.1.1 and 1.2
because the function was changed in Apache 1.2.
o Incorporated a patch to make mod_rewrite useable under Apache SSL,
i.e. with https:// URLs..
[Thanks to Michael Smith [EMAIL PROTECTED]]
o Added a check whether the proxy module is
compiled in or not. If not then [P] is forbidden. This is not 100%
safe, because it can still be turned off (ProxyRequests off) and then
[P] can lead to a core dump. But there is no trivial way to check if
the ProxyRequest is turned on or off. But the current variant of the
check is useful for people who use [P] but have no proxy module
even compiled in.
o Added some warning to the documentation that ProxyRequests must be
on when the [P] flag gets used.
[Thanks to Philip Peake [EMAIL PROTECTED] for hint]
o Fixed the installation description in the docs.
o Fixed a recently removed # char in mod_rewrite.h
Patchlevel 9:
The recently introduced proxy check code was syntactically correct but not
semantically. Hmmm.. lead to a core dump under 1.2b2. Thanks to Mark J. Cox
[EMAIL PROTECTED] for the hint.
Revision ChangesPath
1.10 +163 -27 apache/src/mod_rewrite.c
Index: mod_rewrite.c
===
RCS file: /export/home/cvs/apache/src/mod_rewrite.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C3 -r1.9 -r1.10
*** mod_rewrite.c 1996/12/09 22:39:19 1.9
--- mod_rewrite.c 1996/12/12 00:36:09 1.10
***
*** 61,67
** |_| |_| |_|\___/ \__,_|___|_| \___| \_/\_/ |_| |_|\__\___|
** |_|
**
! ** URL Rewriting Module, Version 2.3.5 (09-10-1996)
**
** This module uses a rule-based rewriting engine (based on a
** regular-expression parser) to rewrite requested URLs on the fly.
--- 61,67
** |_| |_| |_|\___/ \__,_|___|_| \___| \_/\_/ |_| |_|\__\___|
** |_|
**
! ** URL Rewriting Module, Version 2.3.9 (11-12-1996)
**
** This module uses a rule-based rewriting engine (based on a
** regular-expression parser) to rewrite requested URLs on the fly.
***
*** 87,93
** Written for The Apache Group by
** Ralf S. Engelschall
** [EMAIL PROTECTED]
! ** http://www.engelschall.com/~rse
*/
--- 87,93
** Written for The Apache Group by
** Ralf S. Engelschall
** [EMAIL PROTECTED]
! ** http://www.engelschall.com/
*/
***
*** 97,102
--- 97,103
#include string.h
#include stdarg.h
#include time.h
+ #include signal.h
#include sys/types.h
#include sys/stat.h
#include netinet/in.h
***
*** 111,119
/* now our own stuff ... */
#include mod_rewrite.h
-
/*
** +---+
** | |
--- 112,120
/* now our own stuff ... */
#include mod_rewrite.h
+
/*
** +---+
** | |
***
*** 216,224
NULL /* [#8] log a transaction */
};
! /* the common cache */
cache *cachep;
/* the txt mapfile parsing stuff */
#define MAPFILE_PATTERN ^([^ ]+) +([^ ]+).*$
#ifdef HAS_APACHE_REGEX_LIB
--- 217,228
NULL /* [#8] log a transaction */
};
! /* the cache */
cache *cachep;
+ /* whether proxy module is available or not */
+ static int proxy_available;
+
/* the txt mapfile parsing stuff */
#define MAPFILE_PATTERN ^([^ ]+) +([^ ]+).*$
#ifdef HAS_APACHE_REGEX_LIB
***
*** 349,355
**
*/
! static const char *cmd_rewriteengine(cmd_parms *cmd, rewrite_perdir_conf
*dconf, int flag)
{
rewrite_server_conf *sconf;
--- 353,359
**
*/
! static _const char *cmd_rewriteengine(cmd_parms *cmd, rewrite_perdir_conf
*dconf, int flag)
{
rewrite_server_conf *sconf;
***
*** 362,371
return NULL;
}
! static const char *cmd_rewriteoptions(cmd_parms *cmd,
cvs commit: apache/src CHANGES http_config.h
akosut 96/12/11 17:02:14 Modified:src CHANGES http_config.h Log: Add CHANGES entry for rwrite(), and update MODULE_MAGIC_NUMBER. Revision ChangesPath 1.85 +3 -0 apache/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache/src/CHANGES,v retrieving revision 1.84 retrieving revision 1.85 diff -C3 -r1.84 -r1.85 *** CHANGES 1996/12/11 05:21:38 1.84 --- CHANGES 1996/12/12 01:02:02 1.85 *** *** 1,5 --- 1,8 Changes with Apache 1.2b3: + *) Add rwrite() function to API to allow for sending strings of + arbitrary length. [Doug MacEachern] + *) Remove rlim_t typedef for NetBSD. Do older versions need this? *) Defined rlim_t and WANTHSREGEX=yes for NeXT. 1.24 +1 -1 apache/src/http_config.h Index: http_config.h === RCS file: /export/home/cvs/apache/src/http_config.h,v retrieving revision 1.23 retrieving revision 1.24 diff -C3 -r1.23 -r1.24 *** http_config.h 1996/12/01 20:28:20 1.23 --- http_config.h 1996/12/12 01:02:12 1.24 *** *** 225,231 * handle it back-compatibly, or at least signal an error). */ ! #define MODULE_MAGIC_NUMBER 19961125 #define STANDARD_MODULE_STUFF MODULE_MAGIC_NUMBER, -1, __FILE__, NULL /* Generic accessors for other modules to get at their own module-specific --- 225,231 * handle it back-compatibly, or at least signal an error). */ ! #define MODULE_MAGIC_NUMBER 19961211 #define STANDARD_MODULE_STUFF MODULE_MAGIC_NUMBER, -1, __FILE__, NULL /* Generic accessors for other modules to get at their own module-specific
cvs commit: apache/htdocs/manual/mod core.html mod_cern_meta.html mod_imap.html
brian 96/12/11 17:10:01 Modified:htdocs/manual content-negotiation.html host.html invoking.html keepalive.html location.html virtual-host.html htdocs/manual/misc API.html known_bugs.html htdocs/manual/mod core.html mod_cern_meta.html mod_imap.html Log: Reviewed by: Brian Behlendorf Submitted by: Martin Kraemer More link surgery - I think this should be it. Revision ChangesPath 1.4 +1 -1 apache/htdocs/manual/content-negotiation.html Index: content-negotiation.html === RCS file: /export/home/cvs/apache/htdocs/manual/content-negotiation.html,v retrieving revision 1.3 retrieving revision 1.4 diff -C3 -r1.3 -r1.4 *** content-negotiation.html 1996/12/02 18:13:39 1.3 --- content-negotiation.html 1996/12/12 01:09:38 1.4 *** *** 16,22 supported in the NCSA server, it is likely to assume a new importance in light of the emergence of HTML3 capable browsers. p ! The Apache module A HREF=mod_negotiation.htmlmod_negotiation/A handles content negotiation in two different ways; special treatment for the pseudo-mime-type codeapplication/x-type-map/code, and the MultiViews per-directory Option (which can be set in srm.conf, or in --- 16,22 supported in the NCSA server, it is likely to assume a new importance in light of the emergence of HTML3 capable browsers. p ! The Apache module A HREF=mod/mod_negotiation.htmlmod_negotiation/A handles content negotiation in two different ways; special treatment for the pseudo-mime-type codeapplication/x-type-map/code, and the MultiViews per-directory Option (which can be set in srm.conf, or in 1.5 +1 -1 apache/htdocs/manual/host.html Index: host.html === RCS file: /export/home/cvs/apache/htdocs/manual/host.html,v retrieving revision 1.4 retrieving revision 1.5 diff -C3 -r1.4 -r1.5 *** host.html 1996/12/09 04:08:50 1.4 --- host.html 1996/12/12 01:09:39 1.5 *** *** 108,114 private.foo.com/code header. It is important to note that this condition exists only if you only implement this policy at the IP layer - all security controls used by Apache (i.e., A ! HREF=mod_access.htmlallow, deny from,/A etc.) are consistently respected. h2Compatibility with Older Browsers/h2 --- 108,114 private.foo.com/code header. It is important to note that this condition exists only if you only implement this policy at the IP layer - all security controls used by Apache (i.e., A ! HREF=mod/mod_access.htmlallow, deny from,/A etc.) are consistently respected. h2Compatibility with Older Browsers/h2 1.6 +1 -1 apache/htdocs/manual/invoking.html Index: invoking.html === RCS file: /export/home/cvs/apache/htdocs/manual/invoking.html,v retrieving revision 1.5 retrieving revision 1.6 diff -C3 -r1.5 -r1.6 *** invoking.html 1996/12/02 18:13:41 1.5 --- invoking.html 1996/12/12 01:09:39 1.6 *** *** 76,82 However, these conventions need not be adhered to. p The server also reads a file containing mime document types; the filename ! is set by the A HREF=mod_mime.html#typesconfigTypesConfig/A directive, and is codeconf/mime.types/code by default. h2Log files/h2 --- 76,82 However, these conventions need not be adhered to. p The server also reads a file containing mime document types; the filename ! is set by the A HREF=mod/mod_mime.html#typesconfigTypesConfig/A directive, and is codeconf/mime.types/code by default. h2Log files/h2 1.4 +1 -1 apache/htdocs/manual/keepalive.html Index: keepalive.html === RCS file: /export/home/cvs/apache/htdocs/manual/keepalive.html,v retrieving revision 1.3 retrieving revision 1.4 diff -C3 -r1.3 -r1.4 *** keepalive.html1996/12/02 18:13:41 1.3 --- keepalive.html1996/12/12 01:09:40 1.4 *** *** 41,47 The number of seconds Apache will wait for a subsequent request before closing the connection. Once a request has been received, the timeout value specified by the a ! href=../core.html#timeoutcodeTimeout/code/a directive applies. h2When Keep-Alive Is Used/h2 --- 41,47 The number of seconds Apache will wait for a subsequent request before closing the connection. Once a request has been received, the timeout value specified by the a ! href=mod/core.html#timeoutcodeTimeout/code/a directive applies.
