[AOLSERVER-COMMITS] aolserver/nsd driver.c, 1.59, 1.60 return.c, 1.50, 1.51

[gustafn <gne...@us...>]

Update of /cvsroot/aolserver/aolserver/nsd
In directory vz-cvs-4.sog:/tmp/cvs-serv28631/nsd

Modified Files:
	driver.c return.c 
Log Message:
- added support for returning error 413, request entity too large


Index: return.c
===================================================================
RCS file: /cvsroot/aolserver/aolserver/nsd/return.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** return.c	7 Jul 2006 03:27:22 -0000	1.50
--- return.c	23 Jun 2011 18:15:16 -0000	1.51
***************
*** 1058,1062 ****
--- 1058,1089 ----
      return Ns_ConnReturnStatus(conn, 304);
  }
+ 
+ /*
+  *----------------------------------------------------------------------
+  *
+  * Ns_ConnReturnEntityToLarge --
+  *
+  *	Return a 414 Request Entity to large response.
+  *
+  * Results:
+  *	NS_OK/NS_ERROR 
+  *
+  * Side effects:
+  *	Will close the connection. 
+  *
+  *----------------------------------------------------------------------
+  */
+ 
+ int
+ Ns_ConnReturnEntityToLarge(Ns_Conn *conn)
+ {
+     int result;
  
+     if (ReturnRedirect(conn, 413, &result)) {
+ 	return result;
+     }
+     return Ns_ConnReturnNotice(conn, 413, "Request Entity Too Large",
+ 	"The request entity (e.g. file to be uploaded) is too large.");
+ }
  
  /*

Index: driver.c
===================================================================
RCS file: /cvsroot/aolserver/aolserver/nsd/driver.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** driver.c	8 Dec 2009 04:12:19 -0000	1.59
--- driver.c	23 Jun 2011 18:15:16 -0000	1.60
***************
*** 1675,1679 ****
      if (send(drvPtr->trigger[1], "", 1, 0) != 1) {
  	Ns_Fatal("driver: trigger send() failed: %s",
! 	    ns_sockstrerror(ns_sockerrno));
      }
  }
--- 1675,1679 ----
      if (send(drvPtr->trigger[1], "", 1, 0) != 1) {
  	Ns_Fatal("driver: trigger send() failed: %s",
! 		 ns_sockstrerror(ns_sockerrno));
      }
  }
***************
*** 1751,1754 ****
--- 1751,1757 ----
  	}
  	LogReadError(connPtr, err);
+ 	if (err == E_CRANGE) {
+ 	  Ns_ConnReturnEntityToLarge(connPtr);
+ 	}
      }
  }