Mercurial > illumos > illumos-gate

changeset 10415:a981571edef5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6834314 Improper http response handling
author Anil udupa <anil.udupa@sun.com>
date Mon, 31 Aug 2009 11:18:15 -0700
parents dc0ac18317a0
children 518cc966c6ed
files usr/src/uts/common/fs/sockfs/nl7curi.c
diffstat 1 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/uts/common/fs/sockfs/nl7curi.c	Mon Aug 31 01:15:32 2009 -0700
+++ b/usr/src/uts/common/fs/sockfs/nl7curi.c	Mon Aug 31 11:18:15 2009 -0700
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -2091,10 +2091,6 @@
 			mp->b_rptr = (unsigned char *)cp;
 		}
 		nl7c_uri_hit++;
-		/* If conditional request check for substitute response */
-		if (ruri->conditional) {
-			uri = nl7c_http_cond(ruri, uri);
-		}
 		/* If logging enabled log request */
 		if (nl7c_logd_enabled) {
 			ipaddr_t faddr;
@@ -2109,6 +2105,12 @@
 			/* XXX need to pass response type, e.g. 200, 304 */
 			nl7c_logd_log(ruri, uri, sti->sti_nl7c_rtime, faddr);
 		}
+
+		/* If conditional request check for substitute response */
+		if (ruri->conditional) {
+			uri = nl7c_http_cond(ruri, uri);
+		}
+
 		/*
 		 * Release reference on request URI, send the response out
 		 * the socket, release reference on response uri, set the