svn commit: samba r19139 - in branches/SAMBA_4_0/source/web_server: .

[derrell at samba.org]

Author: derrell
Date: 2006-10-06 15:37:39 +0000 (Fri, 06 Oct 2006)
New Revision: 19139

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19139

Log:
typos; consitent ordering of operations
Modified:
   branches/SAMBA_4_0/source/web_server/http.c


Changeset:
Modified: branches/SAMBA_4_0/source/web_server/http.c
===================================================================
--- branches/SAMBA_4_0/source/web_server/http.c	2006-10-06 15:36:07 UTC (rev 19138)
+++ branches/SAMBA_4_0/source/web_server/http.c	2006-10-06 15:37:39 UTC (rev 19139)
@@ -548,11 +548,13 @@
 }
 
 /*
-  perform pre-authentication on every page is /scripting/preauth.esp
+  perform pre-authentication on every page if /scripting/preauth.esp
   exists.  If this script generates any non-whitepace output at all,
   then we don't run the requested URL.
 
-  note that the preauth is run even for static pages such as images.
+  note that the preauth is run even for static pages such as images, but not
+  for JSON-RPC service requests which do their own authentication via the
+  JSON-RPC server.
 */
 static BOOL http_preauth(struct esp_state *esp)
 {
@@ -900,13 +902,13 @@
             }
             for (i=0;p && i<ARRAY_SIZE(mime_types);i++) {
 		if (strcmp(mime_types[i].extension, p+1) == 0) {
+                    page_type = mime_types[i].page_type;
                     file_type = mime_types[i].mime_type;
-                    page_type = mime_types[i].page_type;
 		}
             }
             if (file_type == NULL) {
+                page_type = page_type_simple;
 		file_type = "text/html";
-                page_type = page_type_simple;
             }
         }