Changeset 2052

Timestamp:

01/18/2008 09:07:54 AM (7 months ago)

Author:

glen

Message:

- HTTPS env var should be "on" when using mod_extforward and the X-Forwarded-Proto header is set. (#1499)

Location:

branches/lighttpd-1.4.x

Files:

• NEWS (modified) (1 diff)
• src/base.h (modified) (1 diff)
• src/mod_extforward.c (modified) (1 diff)
• src/mod_fastcgi.c (modified) (1 diff)

branches/lighttpd-1.4.x/NEWS

@@ -18 +18 @@
   * add IdleServers and Scoreboard directives in ?auto mode for mod_status (#1507)
   * open log immediately after daemonizing, fixes SIGPIPEs on startup  (#165)
+  * HTTPS env var should be "on" when using mod_extforward and the X-Forwarded-Proto header is set. (#1499)
 
 - 1.4.18 - 2007-09-09

branches/lighttpd-1.4.x/src/base.h

@@ -516 +516 @@
         SSL_CTX *ssl_ctx;
 #endif
+       unsigned short is_proxy_ssl;
 } server_socket;
 

branches/lighttpd-1.4.x/src/mod_extforward.c

@@ -380 +380 @@
         if (real_remote_addr != NULL) { /* parsed */
                 sock_addr sock;
-
                 struct addrinfo *addrs_left;
+                server_socket *srv_sock = con->srv_socket;
+                data_string *forwarded_proto = (data_string *) array_get_element(con->request.headers,"X-Forwarded-Proto");
+
+                if (forwarded_proto && !strcmp(forwarded_proto->value->ptr, "https"))
+                        srv_sock->is_proxy_ssl = 1;
+                else
+                        srv_sock->is_proxy_ssl = 0;
 
                 if (con->conf.log_request_handling) {

branches/lighttpd-1.4.x/src/mod_fastcgi.c

@@ -2058 +2058 @@
         FCGI_ENV_ADD_CHECK(fcgi_env_add(p->fcgi_env, CONST_STR_LEN("SERVER_PROTOCOL"), s, strlen(s)),con)
 
-#ifdef USE_OPENSSL
-        if (srv_sock->is_ssl) {
+    if (srv_sock->is_ssl || srv_sock->is_proxy_ssl) {
                 FCGI_ENV_ADD_CHECK(fcgi_env_add(p->fcgi_env, CONST_STR_LEN("HTTPS"), CONST_STR_LEN("on")),con)
         }
-#endif
-
 
         FCGI_ENV_ADD_CHECK(fcgi_env_add_request_headers(srv, con, p), con);