--- src/mod_ssi.c.orig	2008-09-02 01:11:11.000000000 +0200
+++ src/mod_ssi.c	2008-09-02 01:17:47.000000000 +0200
@@ -463,11 +463,12 @@
 		}
 		default: {
 			data_string *ds;
-			/* check if it is a cgi-var */
+			/* check if it is a cgi- or ssi-var (in that order so that you can't override cgi-vars) */
 
 			b = chunkqueue_get_append_buffer(con->send);
 
-			if (NULL != (ds = (data_string *)array_get_element(p->ssi_cgi_env, var_val, strlen(var_val)))) {
+			if ((NULL != (ds = (data_string *)array_get_element(p->ssi_cgi_env, var_val, strlen(var_val)))) ||
+			    (NULL != (ds = (data_string *)array_get_element(p->ssi_vars, var_val, strlen(var_val))))) {
 				buffer_copy_string_buffer(b, ds->value);
 			} else {
 				buffer_copy_string_len(b, CONST_STR_LEN("(none)"));