summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/uts/common/fs/sockfs/nl7curi.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/usr/src/uts/common/fs/sockfs/nl7curi.c b/usr/src/uts/common/fs/sockfs/nl7curi.c
index 61f72258fc..f0ba55de87 100644
--- a/usr/src/uts/common/fs/sockfs/nl7curi.c
+++ b/usr/src/uts/common/fs/sockfs/nl7curi.c
@@ -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 @@ nl7c_parse(struct sonode *so, boolean_t nonblocking, boolean_t *ret)
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 @@ nl7c_parse(struct sonode *so, boolean_t nonblocking, boolean_t *ret)
/* 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