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

[tridge at samba.org]

Author: tridge
Date: 2005-05-27 12:28:59 +0000 (Fri, 27 May 2005)
New Revision: 7017

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

Log:
added a esp variable server['TLS_SUPPORT'] which tells the script if the server
can support TLS. This will allow us to auto-redirect if a user connects using the
wrong protocol

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	2005-05-27 12:23:52 UTC (rev 7016)
+++ branches/SAMBA_4_0/source/web_server/http.c	2005-05-27 12:28:59 UTC (rev 7017)
@@ -409,6 +409,7 @@
 static void http_setup_arrays(struct esp_state *esp)
 {
 	struct websrv_context *web = esp->web;
+	struct esp_data *edata = talloc_get_type(web->task->private, struct esp_data);
 	struct EspRequest *req = esp->req;
 	char *p;
 
@@ -424,6 +425,7 @@
 	SETVAR(ESP_REQUEST_OBJ, "REQUEST_URI", web->input.url);
 	p = strrchr(web->input.url, '/');
 	SETVAR(ESP_REQUEST_OBJ, "SCRIPT_NAME", p+1);
+	SETVAR(ESP_REQUEST_OBJ, "SCRIPT_FILENAME", web->input.url);
 	p = socket_get_peer_name(web->conn->socket, esp);
 	SETVAR(ESP_REQUEST_OBJ, "REMOTE_HOST", p);
 	SETVAR(ESP_REQUEST_OBJ, "REMOTE_ADDR", p);
@@ -450,7 +452,7 @@
 	SETVAR(ESP_SERVER_OBJ, "SERVER_PROTOCOL", web->tls_session?"https":"http");
 	SETVAR(ESP_SERVER_OBJ, "SERVER_SOFTWARE", "SWAT");
 	SETVAR(ESP_SERVER_OBJ, "GATEWAY_INTERFACE", "CGI/1.1");
-	SETVAR(ESP_REQUEST_OBJ, "SCRIPT_FILENAME", web->input.url);
+	SETVAR(ESP_SERVER_OBJ, "TLS_SUPPORT", edata->tls_data?"True":"False");
 }
 
 #if HAVE_SETJMP_H