patch-2.4.10 linux/net/khttpd/waitheaders.c

Next file: linux/net/lapb/lapb_iface.c
Previous file: linux/net/khttpd/rfc.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.9/linux/net/khttpd/waitheaders.c linux/net/khttpd/waitheaders.c
@@ -244,7 +244,7 @@
 		Request->Time       = Request->filp->f_dentry->d_inode->i_mtime;
 		Request->IMS_Time   = mimeTime_to_UnixTime(Request->IMS);
 		sprintf(Request->LengthS,"%i",Request->FileLength);
-		time_Unix2RFC(min(unsigned int, Request->Time,CurrentTime_i),Request->TimeS);
+		time_Unix2RFC(min_t(unsigned int, Request->Time,CurrentTime_i),Request->TimeS);
    	        /* The min() is required by rfc1945, section 10.10:
    	           It is not allowed to send a filetime in the future */
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)