diff -Naur a/lighttpd-1.4.35/src/mod_cgi.c b/lighttpd-1.4.35/src/mod_cgi.c
--- a/lighttpd-1.4.35/src/mod_cgi.c	2014-03-06 19:38:00.000000000 +0530
+++ b/lighttpd-1.4.35/src/mod_cgi.c	2014-07-07 16:11:06.000000000 +0530
@@ -836,9 +836,8 @@
 		cgi_env_add(&env, CONST_STR_LEN("GATEWAY_INTERFACE"), CONST_STR_LEN("CGI/1.1"));
 
 		s = get_http_version_name(con->request.http_version);
-
-		cgi_env_add(&env, CONST_STR_LEN("SERVER_PROTOCOL"), s, strlen(s));
-
+		if (s)
+			cgi_env_add(&env, CONST_STR_LEN("SERVER_PROTOCOL"), s, strlen(s));
 		LI_ltostr(buf,
 #ifdef HAVE_IPV6
 			ntohs(srv_sock->addr.plain.sa_family == AF_INET6 ? srv_sock->addr.ipv6.sin6_port : srv_sock->addr.ipv4.sin_port)
@@ -872,8 +871,8 @@
 		cgi_env_add(&env, CONST_STR_LEN("SERVER_ADDR"), s, strlen(s));
 
 		s = get_http_method_name(con->request.http_method);
-		cgi_env_add(&env, CONST_STR_LEN("REQUEST_METHOD"), s, strlen(s));
-
+		if (s)
+			cgi_env_add(&env, CONST_STR_LEN("REQUEST_METHOD"), s, strlen(s));
 		if (!buffer_is_empty(con->request.pathinfo)) {
 			cgi_env_add(&env, CONST_STR_LEN("PATH_INFO"), CONST_BUF_LEN(con->request.pathinfo));
 		}