cvs commit: apachen/htdocs/manual/mod mod_rewrite.html
marc97/10/31 19:58:33 Modified:htdocs/manual/mod mod_rewrite.html Log: Document that RewriteEngine on is _not_ inherited by vhosts, unlike many other directives. PR: 570 Revision ChangesPath 1.18 +7 -1 apachen/htdocs/manual/mod/mod_rewrite.html Index: mod_rewrite.html === RCS file: /export/home/cvs/apachen/htdocs/manual/mod/mod_rewrite.html,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- mod_rewrite.html 1997/09/11 13:27:52 1.17 +++ mod_rewrite.html 1997/11/01 03:58:32 1.18 @@ -101,6 +101,12 @@ all ttRewriteRule/tt directives! p +Note that, by default, rewrite configurations are not inherited. +This means that you need to have a ttRewriteEngine on/tt +directive for each virtual host you wish to use it in, unless A +HREF=#RewriteOptionsRewriteOptions inherit/A is enabled. + +p hr noshade size=1 p @@ -110,7 +116,7 @@ strongContext:/strong server config, virtual host, per-directory configbr p -The ttRewriteOption/tt directive sets some special options for the +The ttRewriteOptions/tt directive sets some special options for the current per-server or per-directory configuration. The emOption/em strings can be one of the following:
cvs commit: apachen/src/main explain.c http_main.c
martin 97/11/01 14:16:02
Modified:src/main explain.c http_main.c
Log:
Two minor nits for portability: a dummy buffer changed from int[] to
char[], and explain.c includes httpd.h now. Paul is right, however:
explain.c ought to be eliminated and replaced by aplog_error().
Reviewed by: Martin +1, Dean +1, Paul +1 (see commit msg)
Revision ChangesPath
1.5 +1 -0 apachen/src/main/explain.c
Index: explain.c
===
RCS file: /home/cvs/apachen/src/main/explain.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -u -r1.4 -r1.5
--- explain.c 1997/09/16 00:41:31 1.4
+++ explain.c 1997/11/01 22:15:59 1.5
@@ -1,5 +1,6 @@
#include stdio.h
#include stdarg.h
+#include httpd.h
#include explain.h
void _Explain(const char *szFile, int nLine, const char *szFmt,...)
1.242 +1 -1 apachen/src/main/http_main.c
Index: http_main.c
===
RCS file: /home/cvs/apachen/src/main/http_main.c,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -u -r1.241 -r1.242
--- http_main.c 1997/11/01 21:13:21 1.241
+++ http_main.c 1997/11/01 22:15:59 1.242
@@ -984,7 +984,7 @@
*/
static void lingering_close(request_rec *r)
{
-int dummybuf[512];
+char dummybuf[2048];
struct timeval tv;
fd_set lfds, fds_read, fds_err;
int select_rv = 0, read_rv = 0;
cvs commit: apachen/src/main http_protocol.c
martin 97/11/01 14:24:09 Modified:src/main http_protocol.c Log: Apache sent wrong replies in response to certain Range: bytes=... headers. The patch is an update to what Ronald Tschalaer [EMAIL PROTECTED] sent. PR: 1329 Submitted by: Ronald Tschalaer [EMAIL PROTECTED] Reviewed by: Martin +1, Dean +1, Paul +1 Revision ChangesPath 1.169 +6 -3 apachen/src/main/http_protocol.c Index: http_protocol.c === RCS file: /home/cvs/apachen/src/main/http_protocol.c,v retrieving revision 1.168 retrieving revision 1.169 diff -u -u -r1.168 -r1.169 --- http_protocol.c 1997/10/22 20:29:41 1.168 +++ http_protocol.c 1997/11/01 22:24:08 1.169 @@ -100,13 +100,16 @@ *end = clength - 1; } -if (*start *end) -return 0; +if (*start 0) + *start = 0; if (*end = clength) *end = clength - 1; -return 1; +if (*start *end) + return 0; + +return (*start 0 || *end clength - 1); } static int internal_byterange(int, long *, request_rec *, char **, long *,
cvs commit: apache/htdocs/manual/mod core.html mod_actions.html mod_auth_anon.html mod_auth_dbm.html mod_cern_meta.html mod_cgi.html mod_env.html mod_imap.html mod_include.html mod_negotiation.html mod_status.html
dgaudet 97/11/01 15:39:48 Modified:htdocs/manual Tag: APACHE_1_2_X content-negotiation.html custom-error.html dns-caveats.html env.html host.html index.html install.html invoking.html man-template.html multilogs.html new_features_1_0.html new_features_1_1.html new_features_1_2.html process-model.html suexec.html vhosts-in-depth.html virtual-host.html htdocs/manual/misc Tag: APACHE_1_2_X API.html client_block_api.html fin_wait_2.html nopgp.html perf-bsd44.html perf-dec.html perf.html security_tips.html vif-info.html htdocs/manual/mod Tag: APACHE_1_2_X core.html mod_actions.html mod_auth_anon.html mod_auth_dbm.html mod_cern_meta.html mod_cgi.html mod_env.html mod_imap.html mod_include.html mod_negotiation.html mod_status.html Log: Merge in doc changes that are relevant from 1.3 branch. Revision ChangesPath No revision No revision 1.10.2.1 +11 -11apache/htdocs/manual/content-negotiation.html Index: content-negotiation.html === RCS file: /export/home/cvs/apache/htdocs/manual/content-negotiation.html,v retrieving revision 1.10 retrieving revision 1.10.2.1 diff -u -r1.10 -r1.10.2.1 --- content-negotiation.html 1997/06/04 11:07:47 1.10 +++ content-negotiation.html 1997/11/01 23:39:18 1.10.2.1 @@ -22,7 +22,7 @@ couple of features to give more intelligent handling of requests from browsers which send incomplete negotiation information. p -Content negotiation is provided by the +Content negotiation is provided by the a href=mod/mod_negotiation.htmlmod_negotiation/a module, which is compiled in by default. @@ -47,7 +47,7 @@ /pre Note that this preference will only be applied when there is a choice -of representations and they vary by language. +of representations and they vary by language. p As an example of a more complex request, this browser has been @@ -78,12 +78,12 @@ In order to negotiate a resource, the server needs to be given information about each of the variants. This is done in one of two -ways: +ways: ul li Using a type map (i.e., a code*.var/code file) which names the files containing the variants explicitly - li Or using a 'MultiViews' search, where the server does an implicit + li Or using a 'MultiViews' search, where the server does an implicit filename pattern match, and chooses from among the results. /ul @@ -154,7 +154,7 @@ interpreted as URLs relative to the map file; they must be on the same server (!), and they must refer to files to which the client would be granted access if they were to be requested - directly. + directly. dt codeContent-type:/code dd media type --- charset, level and qs parameters may be given. These are often referred to as MIME types; typical media types are @@ -244,7 +244,7 @@ trthDimension thNotes trtdMedia Type -tdBrowser indicates preferences on Accept: header. Each item +tdBrowser indicates preferences on Accept: header. Each item can have an associated quality factor. Variant description can also have a quality factor. trtdLanguage @@ -292,7 +292,7 @@ else the order of languages on the Accept-Language header. liSelect the variants with the highest 'level' media parameter - (used to give the version of text/html media types). + (used to give the version of text/html media types). liSelect only unencoded variants, if there is a mix of encoded and non-encoded variants. If either all variants are encoded @@ -366,7 +366,7 @@ The explicit types have no quality factor, so they default to a preference of 1.0 (the highest). The wildcard */* is given a low preference of 0.01, so other types will only be returned if -no variant matches an explicitly listed type. +no variant matches an explicitly listed type. p If the Accept: header contains ino/i q factors at all, Apache sets @@ -386,7 +386,7 @@ The reason for setting this language quality factor for variant with no language to a very low value is to allow for a default variant which can be supplied if none of the -other variants match the browser's language preferences. +other variants match the browser's language preferences. For example, consider the situation with three variants: @@ -409,9 +409,9 @@ document, provided it is still within date. But if the resource is subject to content negotiation at the server,
cvs commit: apachen/src/modules/proxy proxy_util.c
ben 97/11/01 13:13:25
Modified:src/main alloc.c buff.c http_main.c
src/modules/proxy proxy_util.c
Log:
Remove WSABASERROR bollocks. Improve error checking in sendwithtimeout().
Revision ChangesPath
1.56 +1 -1 apachen/src/main/alloc.c
Index: alloc.c
===
RCS file: /export/home/cvs/apachen/src/main/alloc.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- alloc.c 1997/10/22 20:29:31 1.55
+++ alloc.c 1997/11/01 21:13:20 1.56
@@ -1146,7 +1146,7 @@
block_alarms();
res = closesocket(sock);
#ifdef WIN32
-errno = WSAGetLastError() - WSABASEERR;
+errno = WSAGetLastError();
#endif /* WIN32 */
save_errno = errno;
kill_cleanup(a, (void *) (long) sock, socket_cleanup);
1.48 +10 -6 apachen/src/main/buff.c
Index: buff.c
===
RCS file: /export/home/cvs/apachen/src/main/buff.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- buff.c1997/10/22 20:29:32 1.47
+++ buff.c1997/11/01 21:13:20 1.48
@@ -123,15 +123,19 @@
FD_SET(sock, fdset);
tv.tv_usec = 0;
rv = select(FD_SETSIZE, NULL, fdset, NULL, tv);
- if (rv == 0) {
+ if (rv == SOCKET_ERROR)
+ err = WSAGetLastError();
+ else if (rv == 0) {
ioctlsocket(sock, FIONBIO, iostate);
check_alarm();
WSASetLastError(WSAEWOULDBLOCK);
return (SOCKET_ERROR);
}
- rv = send(sock, buf, len, flags);
- if (rv == SOCKET_ERROR)
- err = WSAGetLastError();
+ else {
+ rv = send(sock, buf, len, flags);
+ if (rv == SOCKET_ERROR)
+ err = WSAGetLastError();
+ }
}
}
ioctlsocket(sock, FIONBIO, iostate);
@@ -191,7 +195,7 @@
if (fb-flags B_SOCKET) {
rv = recvwithtimeout(fb-fd_in, buf, nbyte, 0);
if (rv == SOCKET_ERROR)
- errno = WSAGetLastError() - WSABASEERR;
+ errno = WSAGetLastError();
}
else
rv = read(fb-fd_in, buf, nbyte);
@@ -210,7 +214,7 @@
if (fb-flags B_SOCKET) {
rv = sendwithtimeout(fb-fd, buf, nbyte, 0);
if (rv == SOCKET_ERROR)
- errno = WSAGetLastError() - WSABASEERR;
+ errno = WSAGetLastError();
}
else
rv = write(fb-fd, buf, nbyte);
1.241 +2 -2 apachen/src/main/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apachen/src/main/http_main.c,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -r1.240 -r1.241
--- http_main.c 1997/10/30 19:13:34 1.240
+++ http_main.c 1997/11/01 21:13:21 1.241
@@ -3928,7 +3928,7 @@
srv = ap_select(listenmaxfd + 1, main_fds, NULL, NULL, tv);
#ifdef WIN32
if (srv == SOCKET_ERROR)
- errno = WSAGetLastError() - WSABASEERR;
+ errno = WSAGetLastError();
#endif /* WIN32 */
if (srv 0 errno != EINTR)
@@ -3958,7 +3958,7 @@
#ifdef WIN32
if (csd == INVALID_SOCKET) {
csd = -1;
- errno = WSAGetLastError() - WSABASEERR;
+ errno = WSAGetLastError();
}
#endif /* WIN32 */
} while (csd 0 errno == EINTR);
1.35 +1 -1 apachen/src/modules/proxy/proxy_util.c
Index: proxy_util.c
===
RCS file: /export/home/cvs/apachen/src/modules/proxy/proxy_util.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- proxy_util.c 1997/10/30 19:17:56 1.34
+++ proxy_util.c 1997/11/01 21:13:24 1.35
@@ -1173,7 +1173,7 @@
i = connect(sock, (struct sockaddr *) addr, sizeof(struct sockaddr_in));
#ifdef WIN32
if (i == SOCKET_ERROR)
- errno = WSAGetLastError() - WSABASEERR;
+ errno = WSAGetLastError();
#endif /* WIN32 */
} while (i == -1 errno == EINTR);
if (i == -1) {
