[packages/lighttpd.git] / lighttpd-branch.diff

Index: configure.in
===================================================================
Index: src/configfile-glue.c
===================================================================
--- src/configfile-glue.c	(.../tags/lighttpd-1.4.19)	(revision 2145)
+++ src/configfile-glue.c	(.../branches/lighttpd-1.4.x)	(revision 2145)
@@ -529,7 +529,7 @@
 int config_append_cond_match_buffer(connection *con, data_config *dc, buffer *buf, int n)
 {
 	cond_cache_t *cache = &con->cond_cache[dc->context_ndx];
-	if (n > cache->patterncount) {
+	if (n >= cache->patterncount) {
 		return 0;
 	}
 
Index: src/connections.c
===================================================================
--- src/connections.c	(.../tags/lighttpd-1.4.19)	(revision 2145)
+++ src/connections.c	(.../branches/lighttpd-1.4.x)	(revision 2145)
@@ -199,6 +199,7 @@
 
 	/* don't resize the buffer if we were in SSL_ERROR_WANT_* */
 
+	ERR_clear_error();
 	do {
 		if (!con->ssl_error_want_reuse_buffer) {
 			b = buffer_init();
@@ -1668,21 +1669,51 @@
 			}
 #ifdef USE_OPENSSL
 			if (srv_sock->is_ssl) {
-				int ret;
+				int ret, ssl_r;
+				unsigned long err;
+				ERR_clear_error();
 				switch ((ret = SSL_shutdown(con->ssl))) {
 				case 1:
 					/* ok */
 					break;
 				case 0:
-					SSL_shutdown(con->ssl);
-					break;
+					ERR_clear_error();
+					if (-1 != (ret = SSL_shutdown(con->ssl))) break;
+
+					/* fall through */
 				default:
-					log_error_write(srv, __FILE__, __LINE__, "sds", "SSL:",
-							SSL_get_error(con->ssl, ret),
-							ERR_error_string(ERR_get_error(), NULL));
-					return -1;
+
+					switch ((ssl_r = SSL_get_error(con->ssl, ret))) {
+					case SSL_ERROR_WANT_WRITE:
+					case SSL_ERROR_WANT_READ:
+						break;
+					case SSL_ERROR_SYSCALL:
+						/* perhaps we have error waiting in our error-queue */
+						if (0 != (err = ERR_get_error())) {
+							do {
+								log_error_write(srv, __FILE__, __LINE__, "sdds", "SSL:",
+										ssl_r, ret,
+										ERR_error_string(err, NULL));
+							} while((err = ERR_get_error()));
+						} else {
+							log_error_write(srv, __FILE__, __LINE__, "sddds", "SSL (error):",
+									ssl_r, ret, errno,
+									strerror(errno));
+						}
+	
+						break;
+					default:
+						while((err = ERR_get_error())) {
+							log_error_write(srv, __FILE__, __LINE__, "sdds", "SSL:",
+									ssl_r, ret,
+									ERR_error_string(err, NULL));
+						}
+	
+						break;
+					}
 				}
 			}
+			ERR_clear_error();
 #endif
 
 			switch(con->mode) {
Index: src/response.c
===================================================================
--- src/response.c	(.../tags/lighttpd-1.4.19)	(revision 2145)
+++ src/response.c	(.../branches/lighttpd-1.4.x)	(revision 2145)
@@ -101,7 +101,7 @@
 	if (!have_server) {
 		if (buffer_is_empty(con->conf.server_tag)) {
 			BUFFER_APPEND_STRING_CONST(b, "\r\nServer: " PACKAGE_NAME "/" PACKAGE_VERSION);
-		} else {
+		} else if (con->conf.server_tag->used > 1) {
 			BUFFER_APPEND_STRING_CONST(b, "\r\nServer: ");
 			buffer_append_string_encoded(b, CONST_BUF_LEN(con->conf.server_tag), ENCODING_HTTP_HEADER);
 		}
Index: src/mod_extforward.c
===================================================================
--- src/mod_extforward.c	(.../tags/lighttpd-1.4.19)	(revision 2145)
+++ src/mod_extforward.c	(.../branches/lighttpd-1.4.x)	(revision 2145)
@@ -281,8 +281,9 @@
 static const char *last_not_in_array(array *a, plugin_data *p)
 {
 	array *forwarder = p->conf.forwarder;
+	int i;
 
-	for (int i = a->used - 1; i >= 0; i--) {
+	for (i = a->used - 1; i >= 0; i--) {
 		data_string *ds = (data_string *)a->data[i];
 		const char *ip = ds->value->ptr;
 
Index: src/network_openssl.c
===================================================================
--- src/network_openssl.c	(.../tags/lighttpd-1.4.19)	(revision 2145)
+++ src/network_openssl.c	(.../branches/lighttpd-1.4.x)	(revision 2145)
@@ -85,6 +85,7 @@
 			 *
 			 */
 
+			ERR_clear_error();
 			if ((r = SSL_write(ssl, offset, toSend)) <= 0) {
 				unsigned long err;
 
@@ -187,6 +188,7 @@
 
 				close(ifd);
 
+				ERR_clear_error();
 				if ((r = SSL_write(ssl, s, toSend)) <= 0) {
 					unsigned long err;
 
Index: src/mod_compress.c
===================================================================
--- src/mod_compress.c	(.../tags/lighttpd-1.4.19)	(revision 2145)
+++ src/mod_compress.c	(.../branches/lighttpd-1.4.x)	(revision 2145)
@@ -178,9 +178,9 @@
 		}
 
 		if (!buffer_is_empty(s->compress_cache_dir)) {
+			struct stat st;
 			mkdir_recursive(s->compress_cache_dir->ptr);
 
-			struct stat st;
 			if (0 != stat(s->compress_cache_dir->ptr, &st)) {
 				log_error_write(srv, __FILE__, __LINE__, "sbs", "can't stat compress.cache-dir",
 						s->compress_cache_dir, strerror(errno));
Index: src/mod_fastcgi.c
===================================================================
--- src/mod_fastcgi.c	(.../tags/lighttpd-1.4.19)	(revision 2145)
+++ src/mod_fastcgi.c	(.../branches/lighttpd-1.4.x)	(revision 2145)
@@ -2544,7 +2544,10 @@
 					stat_cache_entry *sce;
 
 					if (HANDLER_ERROR != stat_cache_get_entry(srv, con, ds->value, &sce)) {
-						data_string *dcls = data_string_init();
+						data_string *dcls;
+						if (NULL == (dcls = (data_string *)array_get_unused_element(con->response.headers, TYPE_STRING))) {
+							dcls = data_response_init();
+						}
 						/* found */
 						http_chunk_append_file(srv, con, ds->value, 0, sce->st.st_size);
 						hctx->send_content_body = 0; /* ignore the content */
Index: src/mod_magnet.c
===================================================================
--- src/mod_magnet.c	(.../tags/lighttpd-1.4.19)	(revision 2145)
+++ src/mod_magnet.c	(.../branches/lighttpd-1.4.x)	(revision 2145)
@@ -414,10 +414,16 @@
 	case MAGNET_ENV_URI_AUTHORITY: dest = con->uri.authority; break;
 	case MAGNET_ENV_URI_QUERY: dest = con->uri.query; break;
 
-	case MAGNET_ENV_REQUEST_METHOD:   break;
+	case MAGNET_ENV_REQUEST_METHOD:
+		buffer_copy_string(srv->tmp_buf, get_http_method_name(con->request.http_method));
+		dest = srv->tmp_buf;
+		break;
 	case MAGNET_ENV_REQUEST_URI:      dest = con->request.uri; break;
 	case MAGNET_ENV_REQUEST_ORIG_URI: dest = con->request.orig_uri; break;
-	case MAGNET_ENV_REQUEST_PROTOCOL: break;
+	case MAGNET_ENV_REQUEST_PROTOCOL:
+		buffer_copy_string(srv->tmp_buf, get_http_version_name(con->request.http_version));
+		dest = srv->tmp_buf;
+		break;
 
 	case MAGNET_ENV_UNSET: break;
 	}
Index: doc/userdir.txt
===================================================================
--- doc/userdir.txt	(.../tags/lighttpd-1.4.19)	(revision 2145)
+++ doc/userdir.txt	(.../branches/lighttpd-1.4.x)	(revision 2145)
@@ -46,10 +46,10 @@
 Options
 =======
 
-userdir.path
+userdir.path (required option)
   usually it should be set to "public_html" to take ~/public_html/ as the document root
 
-  Default: empty (document root is the home directory)
+  Default: unset (mod_userdir disabled; set it to "" if you want the home directory to be the document root as it was the default before 1.4.19)
   Example: ::
 
     userdir.path = "public_html"
Index: SConstruct
===================================================================
--- SConstruct	(.../tags/lighttpd-1.4.19)	(revision 2145)
+++ SConstruct	(.../branches/lighttpd-1.4.x)	(revision 2145)
@@ -5,7 +5,7 @@
 from stat import *
 
 package = 'lighttpd'
-version = '1.4.19'
+version = '1.4.20'
 
 def checkCHeaders(autoconf, hdrs):
 	p = re.compile('[^A-Z0-9]')
Index: NEWS
===================================================================
--- NEWS	(.../tags/lighttpd-1.4.19)	(revision 2145)
+++ NEWS	(.../branches/lighttpd-1.4.x)	(revision 2145)
@@ -3,8 +3,19 @@
 NEWS
 ====
 
-- 1.4.19 -
+- 1.4.20 -
 
+  * Fix mod_compress to compile with old gcc version (#1592)
+  * Fix mod_extforward to compile with old gcc version (#1591)
+  * Update documentation for #1587
+  * Fix #285 again: read error after SSL_shutdown (thx marton.illes@balabit.com) and clear the error queue before some other calls (CVE-2008-1531)
+  * Fix mod_magnet: enable "request.method" and "request.protocol" in lighty.env (#1308)
+  * Fix segfault for appending matched parts if there was no regex matching (just give empty strings) (#1601)
+  * Use data_response_init in mod_fastcgi x-sendfile handling for response.headers, fix a small "memleak" (#1628)
+  * Don't send empty Server headers (#1620)
+
+- 1.4.19 - 2008-03-10
+
   * added support for If-Range: <date> (#1346)
   * added support for matching $HTTP["scheme"] in configs
   * fixed initgroups() called after chroot (#1384)

Property changes on: .
___________________________________________________________________
Name: svk:merge
   - 152afb58-edef-0310-8abb-c4023f1b3aa9:/branches/lighttpd-1.3.x:499
152afb58-edef-0310-8abb-c4023f1b3aa9:/branches/lighttpd-1.4.11-ssl-fixes:1346
152afb58-edef-0310-8abb-c4023f1b3aa9:/branches/lighttpd-merge-1.4.x:1041
152afb58-edef-0310-8abb-c4023f1b3aa9:/tags/lighttpd-1.4.11:1042
152afb58-edef-0310-8abb-c4023f1b3aa9:/tags/release-1.3.13:105
152afb58-edef-0310-8abb-c4023f1b3aa9:/trunk:104
a98e19e4-a712-0410-8832-6551a15ffc53:/local/branches/lighttpd-1.4.x:1557
ebd0e9cf-3e47-4385-9dd4-f0e25e97baa2:/local/lighttpd/branches/lighttpd-1.4.x:2164
   + 152afb58-edef-0310-8abb-c4023f1b3aa9:/branches/lighttpd-1.3.x:499
152afb58-edef-0310-8abb-c4023f1b3aa9:/branches/lighttpd-1.4.11-ssl-fixes:1346
152afb58-edef-0310-8abb-c4023f1b3aa9:/branches/lighttpd-merge-1.4.x:1041
152afb58-edef-0310-8abb-c4023f1b3aa9:/tags/lighttpd-1.4.11:1042
152afb58-edef-0310-8abb-c4023f1b3aa9:/tags/release-1.3.13:105
152afb58-edef-0310-8abb-c4023f1b3aa9:/trunk:104
a98e19e4-a712-0410-8832-6551a15ffc53:/local/branches/lighttpd-1.4.x:1557
ebd0e9cf-3e47-4385-9dd4-f0e25e97baa2:/local/lighttpd/branches/lighttpd-1.4.x:2209
Commit	Line	Data
	1	Index: configure.in
	2	===================================================================
	3	Index: src/configfile-glue.c
	4	===================================================================
	5	--- src/configfile-glue.c (.../tags/lighttpd-1.4.19) (revision 2145)
	6	+++ src/configfile-glue.c (.../branches/lighttpd-1.4.x) (revision 2145)
	7	@@ -529,7 +529,7 @@
	8	int config_append_cond_match_buffer(connection con, data_config dc, buffer *buf, int n)
	9	{
	10	cond_cache_t *cache = &con->cond_cache[dc->context_ndx];
	11	- if (n > cache->patterncount) {
	12	+ if (n >= cache->patterncount) {
	13	return 0;
	14	}
	15
	16	Index: src/connections.c
	17	===================================================================
	18	--- src/connections.c (.../tags/lighttpd-1.4.19) (revision 2145)
	19	+++ src/connections.c (.../branches/lighttpd-1.4.x) (revision 2145)
	20	@@ -199,6 +199,7 @@
	21
	22	/* don't resize the buffer if we were in SSL_ERROR_WANT_* */
	23
	24	+ ERR_clear_error();
	25	do {
	26	if (!con->ssl_error_want_reuse_buffer) {
	27	b = buffer_init();
	28	@@ -1668,21 +1669,51 @@
	29	}
	30	#ifdef USE_OPENSSL
	31	if (srv_sock->is_ssl) {
	32	- int ret;
	33	+ int ret, ssl_r;
	34	+ unsigned long err;
	35	+ ERR_clear_error();
	36	switch ((ret = SSL_shutdown(con->ssl))) {
	37	case 1:
	38	/* ok */
	39	break;
	40	case 0:
	41	- SSL_shutdown(con->ssl);
	42	- break;
	43	+ ERR_clear_error();
	44	+ if (-1 != (ret = SSL_shutdown(con->ssl))) break;
	45	+
	46	+ /* fall through */
	47	default:
	48	- log_error_write(srv, __FILE__, __LINE__, "sds", "SSL:",
	49	- SSL_get_error(con->ssl, ret),
	50	- ERR_error_string(ERR_get_error(), NULL));
	51	- return -1;
	52	+
	53	+ switch ((ssl_r = SSL_get_error(con->ssl, ret))) {
	54	+ case SSL_ERROR_WANT_WRITE:
	55	+ case SSL_ERROR_WANT_READ:
	56	+ break;
	57	+ case SSL_ERROR_SYSCALL:
	58	+ /* perhaps we have error waiting in our error-queue */
	59	+ if (0 != (err = ERR_get_error())) {
	60	+ do {
	61	+ log_error_write(srv, __FILE__, __LINE__, "sdds", "SSL:",
	62	+ ssl_r, ret,
	63	+ ERR_error_string(err, NULL));
	64	+ } while((err = ERR_get_error()));
	65	+ } else {
	66	+ log_error_write(srv, __FILE__, __LINE__, "sddds", "SSL (error):",
	67	+ ssl_r, ret, errno,
	68	+ strerror(errno));
	69	+ }
	70	+
	71	+ break;
	72	+ default:
	73	+ while((err = ERR_get_error())) {
	74	+ log_error_write(srv, __FILE__, __LINE__, "sdds", "SSL:",
	75	+ ssl_r, ret,
	76	+ ERR_error_string(err, NULL));
	77	+ }
	78	+
	79	+ break;
	80	+ }
	81	}
	82	}
	83	+ ERR_clear_error();
	84	#endif
	85
	86	switch(con->mode) {
	87	Index: src/response.c
	88	===================================================================
	89	--- src/response.c (.../tags/lighttpd-1.4.19) (revision 2145)
	90	+++ src/response.c (.../branches/lighttpd-1.4.x) (revision 2145)
	91	@@ -101,7 +101,7 @@
	92	if (!have_server) {
	93	if (buffer_is_empty(con->conf.server_tag)) {
	94	BUFFER_APPEND_STRING_CONST(b, "\r\nServer: " PACKAGE_NAME "/" PACKAGE_VERSION);
	95	- } else {
	96	+ } else if (con->conf.server_tag->used > 1) {
	97	BUFFER_APPEND_STRING_CONST(b, "\r\nServer: ");
	98	buffer_append_string_encoded(b, CONST_BUF_LEN(con->conf.server_tag), ENCODING_HTTP_HEADER);
	99	}
	100	Index: src/mod_extforward.c
	101	===================================================================
	102	--- src/mod_extforward.c (.../tags/lighttpd-1.4.19) (revision 2145)
	103	+++ src/mod_extforward.c (.../branches/lighttpd-1.4.x) (revision 2145)
	104	@@ -281,8 +281,9 @@
	105	static const char last_not_in_array(array a, plugin_data *p)
	106	{
	107	array *forwarder = p->conf.forwarder;
	108	+ int i;
	109
	110	- for (int i = a->used - 1; i >= 0; i--) {
	111	+ for (i = a->used - 1; i >= 0; i--) {
	112	data_string ds = (data_string )a->data[i];
	113	const char *ip = ds->value->ptr;
	114
	115	Index: src/network_openssl.c
	116	===================================================================
	117	--- src/network_openssl.c (.../tags/lighttpd-1.4.19) (revision 2145)
	118	+++ src/network_openssl.c (.../branches/lighttpd-1.4.x) (revision 2145)
	119	@@ -85,6 +85,7 @@
	120	*
	121	*/
	122
	123	+ ERR_clear_error();
	124	if ((r = SSL_write(ssl, offset, toSend)) <= 0) {
	125	unsigned long err;
	126
	127	@@ -187,6 +188,7 @@
	128
	129	close(ifd);
	130
	131	+ ERR_clear_error();
	132	if ((r = SSL_write(ssl, s, toSend)) <= 0) {
	133	unsigned long err;
	134
	135	Index: src/mod_compress.c
	136	===================================================================
	137	--- src/mod_compress.c (.../tags/lighttpd-1.4.19) (revision 2145)
	138	+++ src/mod_compress.c (.../branches/lighttpd-1.4.x) (revision 2145)
	139	@@ -178,9 +178,9 @@
	140	}
	141
	142	if (!buffer_is_empty(s->compress_cache_dir)) {
	143	+ struct stat st;
	144	mkdir_recursive(s->compress_cache_dir->ptr);
	145
	146	- struct stat st;
	147	if (0 != stat(s->compress_cache_dir->ptr, &st)) {
	148	log_error_write(srv, __FILE__, __LINE__, "sbs", "can't stat compress.cache-dir",
	149	s->compress_cache_dir, strerror(errno));
	150	Index: src/mod_fastcgi.c
	151	===================================================================
	152	--- src/mod_fastcgi.c (.../tags/lighttpd-1.4.19) (revision 2145)
	153	+++ src/mod_fastcgi.c (.../branches/lighttpd-1.4.x) (revision 2145)
	154	@@ -2544,7 +2544,10 @@
	155	stat_cache_entry *sce;
	156
	157	if (HANDLER_ERROR != stat_cache_get_entry(srv, con, ds->value, &sce)) {
	158	- data_string *dcls = data_string_init();
	159	+ data_string *dcls;
	160	+ if (NULL == (dcls = (data_string *)array_get_unused_element(con->response.headers, TYPE_STRING))) {
	161	+ dcls = data_response_init();
	162	+ }
	163	/* found */
	164	http_chunk_append_file(srv, con, ds->value, 0, sce->st.st_size);
	165	hctx->send_content_body = 0; /* ignore the content */
	166	Index: src/mod_magnet.c
	167	===================================================================
	168	--- src/mod_magnet.c (.../tags/lighttpd-1.4.19) (revision 2145)
	169	+++ src/mod_magnet.c (.../branches/lighttpd-1.4.x) (revision 2145)
	170	@@ -414,10 +414,16 @@
	171	case MAGNET_ENV_URI_AUTHORITY: dest = con->uri.authority; break;
	172	case MAGNET_ENV_URI_QUERY: dest = con->uri.query; break;
	173
	174	- case MAGNET_ENV_REQUEST_METHOD: break;
	175	+ case MAGNET_ENV_REQUEST_METHOD:
	176	+ buffer_copy_string(srv->tmp_buf, get_http_method_name(con->request.http_method));
	177	+ dest = srv->tmp_buf;
	178	+ break;
	179	case MAGNET_ENV_REQUEST_URI: dest = con->request.uri; break;
	180	case MAGNET_ENV_REQUEST_ORIG_URI: dest = con->request.orig_uri; break;
	181	- case MAGNET_ENV_REQUEST_PROTOCOL: break;
	182	+ case MAGNET_ENV_REQUEST_PROTOCOL:
	183	+ buffer_copy_string(srv->tmp_buf, get_http_version_name(con->request.http_version));
	184	+ dest = srv->tmp_buf;
	185	+ break;
	186
	187	case MAGNET_ENV_UNSET: break;
	188	}
	189	Index: doc/userdir.txt
	190	===================================================================
	191	--- doc/userdir.txt (.../tags/lighttpd-1.4.19) (revision 2145)
	192	+++ doc/userdir.txt (.../branches/lighttpd-1.4.x) (revision 2145)
	193	@@ -46,10 +46,10 @@
	194	Options
	195	=======
	196
	197	-userdir.path
	198	+userdir.path (required option)
	199	usually it should be set to "public_html" to take ~/public_html/ as the document root
	200
	201	- Default: empty (document root is the home directory)
	202	+ Default: unset (mod_userdir disabled; set it to "" if you want the home directory to be the document root as it was the default before 1.4.19)
	203	Example: ::
	204
	205	userdir.path = "public_html"
	206	Index: SConstruct
	207	===================================================================
	208	--- SConstruct (.../tags/lighttpd-1.4.19) (revision 2145)
	209	+++ SConstruct (.../branches/lighttpd-1.4.x) (revision 2145)
	210	@@ -5,7 +5,7 @@
	211	from stat import *
	212
	213	package = 'lighttpd'
	214	-version = '1.4.19'
	215	+version = '1.4.20'
	216
	217	def checkCHeaders(autoconf, hdrs):
	218	p = re.compile('[^A-Z0-9]')
	219	Index: NEWS
	220	===================================================================
	221	--- NEWS (.../tags/lighttpd-1.4.19) (revision 2145)
	222	+++ NEWS (.../branches/lighttpd-1.4.x) (revision 2145)
	223	@@ -3,8 +3,19 @@
	224	NEWS
	225	====
	226
	227	-- 1.4.19 -
	228	+- 1.4.20 -
	229
	230	+ * Fix mod_compress to compile with old gcc version (#1592)
	231	+ * Fix mod_extforward to compile with old gcc version (#1591)
	232	+ * Update documentation for #1587
	233	+ * Fix #285 again: read error after SSL_shutdown (thx marton.illes@balabit.com) and clear the error queue before some other calls (CVE-2008-1531)
	234	+ * Fix mod_magnet: enable "request.method" and "request.protocol" in lighty.env (#1308)
	235	+ * Fix segfault for appending matched parts if there was no regex matching (just give empty strings) (#1601)
	236	+ * Use data_response_init in mod_fastcgi x-sendfile handling for response.headers, fix a small "memleak" (#1628)
	237	+ * Don't send empty Server headers (#1620)
	238	+
	239	+- 1.4.19 - 2008-03-10
	240	+
	241	* added support for If-Range: <date> (#1346)
	242	* added support for matching $HTTP["scheme"] in configs
	243	* fixed initgroups() called after chroot (#1384)
	244
	245	Property changes on: .
	246	___________________________________________________________________
	247	Name: svk:merge
	248	- 152afb58-edef-0310-8abb-c4023f1b3aa9:/branches/lighttpd-1.3.x:499
	249	152afb58-edef-0310-8abb-c4023f1b3aa9:/branches/lighttpd-1.4.11-ssl-fixes:1346
	250	152afb58-edef-0310-8abb-c4023f1b3aa9:/branches/lighttpd-merge-1.4.x:1041
	251	152afb58-edef-0310-8abb-c4023f1b3aa9:/tags/lighttpd-1.4.11:1042
	252	152afb58-edef-0310-8abb-c4023f1b3aa9:/tags/release-1.3.13:105
	253	152afb58-edef-0310-8abb-c4023f1b3aa9:/trunk:104
	254	a98e19e4-a712-0410-8832-6551a15ffc53:/local/branches/lighttpd-1.4.x:1557
	255	ebd0e9cf-3e47-4385-9dd4-f0e25e97baa2:/local/lighttpd/branches/lighttpd-1.4.x:2164
	256	+ 152afb58-edef-0310-8abb-c4023f1b3aa9:/branches/lighttpd-1.3.x:499
	257	152afb58-edef-0310-8abb-c4023f1b3aa9:/branches/lighttpd-1.4.11-ssl-fixes:1346
	258	152afb58-edef-0310-8abb-c4023f1b3aa9:/branches/lighttpd-merge-1.4.x:1041
	259	152afb58-edef-0310-8abb-c4023f1b3aa9:/tags/lighttpd-1.4.11:1042
	260	152afb58-edef-0310-8abb-c4023f1b3aa9:/tags/release-1.3.13:105
	261	152afb58-edef-0310-8abb-c4023f1b3aa9:/trunk:104
	262	a98e19e4-a712-0410-8832-6551a15ffc53:/local/branches/lighttpd-1.4.x:1557
	263	ebd0e9cf-3e47-4385-9dd4-f0e25e97baa2:/local/lighttpd/branches/lighttpd-1.4.x:2209
	264