Update of /cvsroot/naviserver/naviserver/nsd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13693
Modified Files:
nsd.h return.c server.c
Log Message:
Removed handling of aolpress config parameter (RFE #1165562)
Index: nsd.h
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/nsd.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** nsd.h 17 Mar 2005 17:49:12 -0000 1.3
--- nsd.h 18 Mar 2005 08:21:06 -0000 1.4
***************
*** 524,528 ****
struct {
- bool aolpress;
bool flushcontent;
bool modsince;
--- 524,527 ----
Index: return.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/return.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** return.c 16 Feb 2005 08:39:33 -0000 1.1.1.1
--- return.c 18 Mar 2005 08:21:06 -0000 1.2
***************
*** 439,443 ****
Ns_ConnSetRequiredHeaders(Ns_Conn *conn, char *type, int length)
{
- Conn *connPtr = (Conn *) conn;
Ns_DString ds;
--- 439,442 ----
***************
*** 451,462 ****
Ns_DStringTrunc(&ds, 0);
- /*
- * Set the standard server header, prepending "NaviServer/2.0"
- * if AOLpress support is enabled.
- */
-
- if (connPtr->servPtr->opts.aolpress) {
- Ns_DStringAppend(&ds, "NaviServer/2.0 ");
- }
Ns_DStringVarAppend(&ds, Ns_InfoServerName(), "/", Ns_InfoServerVersion(), NULL);
Ns_ConnCondSetHeaders(conn, "Server", ds.string);
--- 450,453 ----
Index: server.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/server.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** server.c 16 Feb 2005 08:40:18 -0000 1.1.1.1
--- server.c 18 Mar 2005 08:21:06 -0000 1.2
***************
*** 222,228 ****
servPtr->opts.realm = server;
}
- if (!Ns_ConfigGetBool(path, "enableaolpress", &servPtr->opts.aolpress)) {
- servPtr->opts.aolpress = 0;
- }
if (!Ns_ConfigGetBool(path, "checkmodifiedsince", &servPtr->opts.modsince)) {
servPtr->opts.modsince = 1;
--- 222,225 ----
|
