Skip to content
This repository
Browse code

Clean up: Trims trailing spaces.

git-svn-id: svn://cherokee-project.com/cherokee/trunk@3999 5dc97367-97f1-0310-9951-d761b3857238
  • Loading branch information...
commit 64fd649c931bdf8f6f76c815c9b891ced1c2aff5 1 parent 0cb28be
authored December 14, 2009

Showing 37 changed files with 180 additions and 180 deletions. Show diff stats Hide diff stats

  1. 2  Makefile.am
  2. 2  cget/Makefile.am
  3. 38  cget/main.c
  4. 2  cget/proxy.c
  5. 2  cget/proxy.h
  6. 104  cherokee/Makefile.am
  7. 2  cherokee/pcre/pcre.h
  8. 10  cherokee/zlib/deflate.c
  9. 4  cherokee/zlib/deftree.c
  10. 10  cherokee/zlib/defutil.h
  11. 2  cherokee/zlib/zconf.h
  12. 18  cherokee/zlib/zlib.h
  13. 64  contrib/05to06.py
  14. 10  contrib/06to07.py
  15. 6  contrib/07to08.py
  16. 8  contrib/08to09.py
  17. 2  contrib/0999to09910.py
  18. 2  contrib/bin2buffer.py
  19. 4  contrib/tracelor.py
  20. 2  doc/Makefile.am
  21. 2  doc/basics_download.txt
  22. 4  doc/cookbook_django.txt
  23. 2  doc/cookbook_mailman.txt
  24. 8  doc/cookbook_nagios.txt
  25. 2  doc/cookbook_streaming.txt
  26. 2  doc/modules_handlers_common.txt
  27. 2  doc/modules_handlers_dbslayer.txt
  28. 2  doc/modules_handlers_dirlist.txt
  29. 2  doc/modules_handlers_secdownload.txt
  30. 8  doc/modules_validators_ldap.txt
  31. 2  doc/modules_validators_mysql.txt
  32. 6  icons/README.txt
  33. 10  packages/osx/build.py
  34. 2  packages/osx/utils.py
  35. 2  po/admin/generate_POTFILESin.py
  36. 6  svnlog2changelog.py
  37. 4  www/Makefile.am
2  Makefile.am
@@ -48,7 +48,7 @@ CONFS = \
48 48
 $(CONFS_PRE:.sample.pre=.sample)
49 49
 
50 50
 XMLS_PRE = \
51  
-http-cherokee.xml.pre 
  51
+http-cherokee.xml.pre
52 52
 
53 53
 XMLS = \
54 54
 $(XMLS_PRE:.xml.pre=.xml)
2  cget/Makefile.am
@@ -10,7 +10,7 @@ bin_PROGRAMS = cget
10 10
 cget_LDADD = \
11 11
 $(PTHREAD_LIBS) \
12 12
 ../cherokee/libcherokee-base.la \
13  
-../cherokee/libcherokee-client.la 
  13
+../cherokee/libcherokee-client.la
14 14
 
15 15
 cget_SOURCES = \
16 16
 main.c \
38  cget/main.c
@@ -20,7 +20,7 @@
20 20
  * along with this program; if not, write to the Free Software
21 21
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
22 22
  * 02110-1301, USA.
23  
- */ 
  23
+ */
24 24
 
25 25
 #include "common-internal.h"
26 26
 
@@ -42,7 +42,7 @@
42 42
 
43 43
 #ifdef HAVE_GETOPT_LONG
44 44
 # include <getopt.h>
45  
-#else 
  45
+#else
46 46
 # include "getopt/getopt.h"
47 47
 #endif
48 48
 
@@ -120,9 +120,9 @@ print_tuple_str (const char *title, const char *info)
120 120
 	int   whites;
121 121
 	char *tmp;
122 122
 
123  
-	if (quiet == true) 
  123
+	if (quiet == true)
124 124
 		return;
125  
-	
  125
+
126 126
 	whites = COLUM_NUM - strlen(title);
127 127
 
128 128
 	fprintf (stderr, "%s ", title);
@@ -143,8 +143,8 @@ static void
143 143
 print_tuple_int (const char *title, int num)
144 144
 {
145 145
 	char tmp[128];
146  
-	
147  
-	snprintf (tmp, 128, "%d", num);	
  146
+
  147
+	snprintf (tmp, 128, "%d", num);
148 148
 	print_tuple_str (title, tmp);
149 149
 }
150 150
 
@@ -157,7 +157,7 @@ do_download__init (cherokee_downloader_t *downloader, void *param)
157 157
 	UNUSED(param);
158 158
 
159 159
 	url = &downloader->request.url;
160  
-	
  160
+
161 161
 	print_tuple_str ("Host",    url->host.buf);
162 162
 	print_tuple_str ("Request", url->request.buf);
163 163
 	print_tuple_int ("Port",    url->port);
@@ -195,7 +195,7 @@ do_download__has_headers (cherokee_downloader_t *downloader, void *param)
195 195
 	 */
196 196
 	if (global_fd == UNSET_FD) {
197 197
 		char *name;
198  
-		
  198
+
199 199
 		name = strrchr (req->buf, '/');
200 200
 		if (name == NULL) {
201 201
 			name = "index.html";
@@ -257,7 +257,7 @@ do_download__read_body (cherokee_downloader_t *downloader, void *param)
257 257
 	}
258 258
 
259 259
 	cherokee_buffer_mrproper (&tmp);
260  
-	return ret_ok;	
  260
+	return ret_ok;
261 261
 }
262 262
 
263 263
 
@@ -295,7 +295,7 @@ do_download (cherokee_downloader_t *downloader)
295 295
 			if ( !reading && (status & downloader_status_post_sent)) {
296 296
 				reading = true;
297 297
 			}
298  
-			
  298
+
299 299
 			if ( (status & downloader_status_headers_received) && !got_headers) {
300 300
 				do_download__has_headers (downloader, NULL);
301 301
 				got_headers = true;
@@ -309,16 +309,16 @@ do_download (cherokee_downloader_t *downloader)
309 309
 				do_download__finish (downloader, NULL);
310 310
 			}
311 311
 			break;
312  
-			
  312
+
313 313
 		case ret_eagain:
314 314
 			/* It's going on..
315 315
 			 */
316 316
 			break;
317  
-			
  317
+
318 318
 		case ret_eof_have_data:
319 319
 			if ((status & downloader_status_headers_received) && !got_headers) {
320 320
 				do_download__has_headers (downloader, NULL);
321  
-				got_headers = true;				
  321
+				got_headers = true;
322 322
 			}
323 323
 			if (status & downloader_status_data_available) {
324 324
 				do_download__read_body (downloader, NULL);
@@ -335,7 +335,7 @@ do_download (cherokee_downloader_t *downloader)
335 335
 			/* Finished or critical error
336 336
 			 */
337 337
 			return ret;
338  
-			
  338
+
339 339
 		default:
340 340
 			SHOULDNT_HAPPEN;
341 341
 			return ret_error;
@@ -393,9 +393,9 @@ main (int argc, char **argv)
393 393
 			}
394 394
 			break;
395 395
 
396  
-		case 0: 
  396
+		case 0:
397 397
 			break;
398  
-			
  398
+
399 399
 		case 'q':
400 400
 			quiet = true;
401 401
 			break;
@@ -415,7 +415,7 @@ main (int argc, char **argv)
415 415
 	/* The rest..
416 416
 	 */
417 417
 	param_num = argc - optind;
418  
-	
  418
+
419 419
 	if (param_num <= 0) {
420 420
 		print_usage();
421 421
 		return EXIT_OK;
@@ -428,7 +428,7 @@ main (int argc, char **argv)
428 428
 
429 429
 	for (val=optind; val<optind+param_num; val++) {
430 430
 		cherokee_buffer_t url = CHEROKEE_BUF_INIT;
431  
-		
  431
+
432 432
 		/* Build the url buffer
433 433
 		 */
434 434
 		ret = cherokee_buffer_add_va (&url, "%s", argv[val]);
@@ -475,7 +475,7 @@ main (int argc, char **argv)
475 475
 	/* Close the output file
476 476
 	 */
477 477
 	re = close (output_fd);
478  
-	if (re != 0) 
  478
+	if (re != 0)
479 479
 		exit (EXIT_ERROR);
480 480
 
481 481
 	cherokee_mrproper();
2  cget/proxy.c
@@ -20,7 +20,7 @@
20 20
  * along with this program; if not, write to the Free Software
21 21
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
22 22
  * 02110-1301, USA.
23  
- */ 
  23
+ */
24 24
 
25 25
 #include "common-internal.h"
26 26
 #include "proxy.h"
2  cget/proxy.h
@@ -20,7 +20,7 @@
20 20
  * along with this program; if not, write to the Free Software
21 21
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
22 22
  * 02110-1301, USA.
23  
- */ 
  23
+ */
24 24
 
25 25
 #ifndef CGET_PROXY_H
26 26
 #define CGET_PROXY_H
104  cherokee/Makefile.am
@@ -50,7 +50,7 @@ pcre/pcre_globals.c \
50 50
 pcre/pcre_compile.c \
51 51
 pcre/pcre_tables.c \
52 52
 pcre/pcre_exec.c \
53  
-pcre/pcre_get.c 
  53
+pcre/pcre_get.c
54 54
 
55 55
 getopt_src =  \
56 56
 getopt/getopt.h  \
@@ -109,7 +109,7 @@ $(common_ldflags) \
109 109
 -module \
110 110
 -avoid-version \
111 111
 -export-dynamic \
112  
-$(module_ldflags_w32) 
  112
+$(module_ldflags_w32)
113 113
 
114 114
 
115 115
 #
@@ -119,7 +119,7 @@ rule_directory = \
119 119
 rule_directory.c \
120 120
 rule_directory.h
121 121
 
122  
-libplugin_directory_la_LDFLAGS = $(module_ldflags)  
  122
+libplugin_directory_la_LDFLAGS = $(module_ldflags)
123 123
 libplugin_directory_la_SOURCES = $(rule_directory)
124 124
 
125 125
 if STATIC_RULE_DIRECTORY
@@ -136,7 +136,7 @@ rule_extensions = \
136 136
 rule_extensions.c \
137 137
 rule_extensions.h
138 138
 
139  
-libplugin_extensions_la_LDFLAGS = $(module_ldflags)  
  139
+libplugin_extensions_la_LDFLAGS = $(module_ldflags)
140 140
 libplugin_extensions_la_SOURCES = $(rule_extensions)
141 141
 
142 142
 if STATIC_RULE_EXTENSIONS
@@ -153,7 +153,7 @@ rule_request = \
153 153
 rule_request.c \
154 154
 rule_request.h
155 155
 
156  
-libplugin_request_la_LDFLAGS = $(module_ldflags)  
  156
+libplugin_request_la_LDFLAGS = $(module_ldflags)
157 157
 libplugin_request_la_SOURCES = $(rule_request)
158 158
 
159 159
 if STATIC_RULE_REQUEST
@@ -170,7 +170,7 @@ rule_header = \
170 170
 rule_header.c \
171 171
 rule_header.h
172 172
 
173  
-libplugin_header_la_LDFLAGS = $(module_ldflags)  
  173
+libplugin_header_la_LDFLAGS = $(module_ldflags)
174 174
 libplugin_header_la_SOURCES = $(rule_header)
175 175
 
176 176
 if STATIC_RULE_HEADER
@@ -187,7 +187,7 @@ rule_exists = \
187 187
 rule_exists.c \
188 188
 rule_exists.h
189 189
 
190  
-libplugin_exists_la_LDFLAGS = $(module_ldflags)  
  190
+libplugin_exists_la_LDFLAGS = $(module_ldflags)
191 191
 libplugin_exists_la_SOURCES = $(rule_exists)
192 192
 
193 193
 if STATIC_RULE_EXISTS
@@ -204,7 +204,7 @@ rule_url_arg = \
204 204
 rule_url_arg.c \
205 205
 rule_url_arg.h
206 206
 
207  
-libplugin_url_arg_la_LDFLAGS = $(module_ldflags)  
  207
+libplugin_url_arg_la_LDFLAGS = $(module_ldflags)
208 208
 libplugin_url_arg_la_SOURCES = $(rule_url_arg)
209 209
 
210 210
 if STATIC_RULE_URL_ARG
@@ -238,7 +238,7 @@ rule_bind = \
238 238
 rule_bind.c \
239 239
 rule_bind.h
240 240
 
241  
-libplugin_bind_la_LDFLAGS = $(module_ldflags)  
  241
+libplugin_bind_la_LDFLAGS = $(module_ldflags)
242 242
 libplugin_bind_la_SOURCES = $(rule_bind)
243 243
 
244 244
 if STATIC_RULE_BIND
@@ -255,7 +255,7 @@ rule_method = \
255 255
 rule_method.c \
256 256
 rule_method.h
257 257
 
258  
-libplugin_method_la_LDFLAGS = $(module_ldflags)  
  258
+libplugin_method_la_LDFLAGS = $(module_ldflags)
259 259
 libplugin_method_la_SOURCES = $(rule_method)
260 260
 
261 261
 if STATIC_RULE_METHOD
@@ -272,7 +272,7 @@ rule_from = \
272 272
 rule_from.c \
273 273
 rule_from.h
274 274
 
275  
-libplugin_from_la_LDFLAGS = $(module_ldflags)  
  275
+libplugin_from_la_LDFLAGS = $(module_ldflags)
276 276
 libplugin_from_la_SOURCES = $(rule_from)
277 277
 
278 278
 if STATIC_RULE_FROM
@@ -290,7 +290,7 @@ rule_geoip = \
290 290
 rule_geoip.c \
291 291
 rule_geoip.h
292 292
 
293  
-libplugin_geoip_la_LDFLAGS = $(module_ldflags)  
  293
+libplugin_geoip_la_LDFLAGS = $(module_ldflags)
294 294
 libplugin_geoip_la_SOURCES = $(rule_geoip)
295 295
 libplugin_geoip_la_LIBADD  = -lGeoIP
296 296
 
@@ -310,7 +310,7 @@ rule_not = \
310 310
 rule_not.c \
311 311
 rule_not.h
312 312
 
313  
-libplugin_not_la_LDFLAGS = $(module_ldflags)  
  313
+libplugin_not_la_LDFLAGS = $(module_ldflags)
314 314
 libplugin_not_la_SOURCES = $(rule_not)
315 315
 
316 316
 if STATIC_RULE_NOT
@@ -327,7 +327,7 @@ rule_and = \
327 327
 rule_and.c \
328 328
 rule_and.h
329 329
 
330  
-libplugin_and_la_LDFLAGS = $(module_ldflags)  
  330
+libplugin_and_la_LDFLAGS = $(module_ldflags)
331 331
 libplugin_and_la_SOURCES = $(rule_and)
332 332
 
333 333
 if STATIC_RULE_AND
@@ -344,7 +344,7 @@ rule_or = \
344 344
 rule_or.c \
345 345
 rule_or.h
346 346
 
347  
-libplugin_or_la_LDFLAGS = $(module_ldflags)  
  347
+libplugin_or_la_LDFLAGS = $(module_ldflags)
348 348
 libplugin_or_la_SOURCES = $(rule_or)
349 349
 
350 350
 if STATIC_RULE_OR
@@ -361,7 +361,7 @@ vrule_wildcard = \
361 361
 vrule_wildcard.c \
362 362
 vrule_wildcard.h
363 363
 
364  
-libplugin_wildcard_la_LDFLAGS = $(module_ldflags)  
  364
+libplugin_wildcard_la_LDFLAGS = $(module_ldflags)
365 365
 libplugin_wildcard_la_SOURCES = $(vrule_wildcard)
366 366
 
367 367
 if STATIC_VRULE_WILDCARD
@@ -434,7 +434,7 @@ gen_evhost = \
434 434
 gen_evhost.c \
435 435
 gen_evhost.h
436 436
 
437  
-libplugin_evhost_la_LDFLAGS = $(module_ldflags)  
  437
+libplugin_evhost_la_LDFLAGS = $(module_ldflags)
438 438
 libplugin_evhost_la_SOURCES = $(gen_evhost)
439 439
 
440 440
 if STATIC_GEN_EVHOST
@@ -450,7 +450,7 @@ endif
450 450
 handler_server_info = \
451 451
 handler_server_info.c \
452 452
 handler_server_info.h \
453  
-logo.inc 
  453
+logo.inc
454 454
 
455 455
 libplugin_server_info_la_LDFLAGS = $(module_ldflags)
456 456
 libplugin_server_info_la_SOURCES = $(handler_server_info)
@@ -470,7 +470,7 @@ handler_file = \
470 470
 handler_file.c \
471 471
 handler_file.h
472 472
 
473  
-libplugin_file_la_LDFLAGS = $(module_ldflags)  
  473
+libplugin_file_la_LDFLAGS = $(module_ldflags)
474 474
 libplugin_file_la_SOURCES = $(handler_file)
475 475
 
476 476
 if STATIC_HANDLER_FILE
@@ -487,7 +487,7 @@ handler_dirlist = \
487 487
 handler_dirlist.c \
488 488
 handler_dirlist.h
489 489
 
490  
-libplugin_dirlist_la_LDFLAGS = $(module_ldflags)  
  490
+libplugin_dirlist_la_LDFLAGS = $(module_ldflags)
491 491
 libplugin_dirlist_la_SOURCES = $(handler_dirlist)
492 492
 
493 493
 if STATIC_HANDLER_DIRLIST
@@ -508,7 +508,7 @@ handler_render_rrd = \
508 508
 $(rrd_common) \
509 509
 handler_render_rrd.c \
510 510
 handler_render_rrd.h \
511  
-logo.inc 
  511
+logo.inc
512 512
 
513 513
 libplugin_render_rrd_la_LDFLAGS = $(module_ldflags)
514 514
 libplugin_render_rrd_la_SOURCES = $(handler_render_rrd)
@@ -533,7 +533,7 @@ $(handlercgi_cgi) \
533 533
 handler_cgi.c \
534 534
 handler_cgi.h
535 535
 
536  
-libplugin_cgi_la_LDFLAGS = $(module_ldflags)  
  536
+libplugin_cgi_la_LDFLAGS = $(module_ldflags)
537 537
 libplugin_cgi_la_SOURCES = $(handler_cgi)
538 538
 libplugin_cgi_la_LIBADD  = $(dynamic_handler_file_lib)
539 539
 
@@ -556,7 +556,7 @@ $(handlerscgi_cgi) \
556 556
 handler_scgi.h \
557 557
 handler_scgi.c
558 558
 
559  
-libplugin_scgi_la_LDFLAGS = $(module_ldflags)  
  559
+libplugin_scgi_la_LDFLAGS = $(module_ldflags)
560 560
 libplugin_scgi_la_SOURCES = $(handler_scgi)
561 561
 libplugin_scgi_la_LIBADD  = $(dynamic_handler_file_lib)
562 562
 
@@ -580,7 +580,7 @@ fastcgi.h \
580 580
 handler_fcgi.h \
581 581
 handler_fcgi.c
582 582
 
583  
-libplugin_fcgi_la_LDFLAGS = $(module_ldflags)  
  583
+libplugin_fcgi_la_LDFLAGS = $(module_ldflags)
584 584
 libplugin_fcgi_la_SOURCES = $(handler_fcgi)
585 585
 libplugin_fcgi_la_LIBADD  = $(dynamic_handler_file_lib)
586 586
 
@@ -603,7 +603,7 @@ $(handleruwsgi_cgi) \
603 603
 handler_uwsgi.h \
604 604
 handler_uwsgi.c
605 605
 
606  
-libplugin_uwsgi_la_LDFLAGS = $(module_ldflags)  
  606
+libplugin_uwsgi_la_LDFLAGS = $(module_ldflags)
607 607
 libplugin_uwsgi_la_SOURCES = $(handler_uwsgi)
608 608
 libplugin_uwsgi_la_LIBADD  = $(dynamic_handler_file_lib)
609 609
 
@@ -629,9 +629,9 @@ fcgi_dispatcher.c \
629 629
 fcgi_manager.h \
630 630
 fcgi_manager.c \
631 631
 handler_fastcgi.c \
632  
-handler_fastcgi.h 
  632
+handler_fastcgi.h
633 633
 
634  
-libplugin_fastcgi_la_LDFLAGS = $(module_ldflags)  
  634
+libplugin_fastcgi_la_LDFLAGS = $(module_ldflags)
635 635
 libplugin_fastcgi_la_SOURCES = $(handler_fastcgi)
636 636
 libplugin_fastcgi_la_LIBADD  = $(dynamic_handler_file_lib)
637 637
 
@@ -729,7 +729,7 @@ handler_proxy.h \
729 729
 proxy_hosts.h \
730 730
 proxy_hosts.c
731 731
 
732  
-libplugin_proxy_la_LDFLAGS = $(module_ldflags)  
  732
+libplugin_proxy_la_LDFLAGS = $(module_ldflags)
733 733
 libplugin_proxy_la_SOURCES = $(handler_proxy)
734 734
 
735 735
 if STATIC_HANDLER_PROXY
@@ -748,7 +748,7 @@ handler_ssi = \
748 748
 handler_ssi.c \
749 749
 handler_ssi.h
750 750
 
751  
-libplugin_ssi_la_LDFLAGS = $(module_ldflags)  
  751
+libplugin_ssi_la_LDFLAGS = $(module_ldflags)
752 752
 libplugin_ssi_la_SOURCES = $(handler_ssi)
753 753
 
754 754
 if STATIC_HANDLER_SSI
@@ -765,7 +765,7 @@ handler_secdownload = \
765 765
 handler_secdownload.c \
766 766
 handler_secdownload.h
767 767
 
768  
-libplugin_secdownload_la_LDFLAGS = $(module_ldflags)  
  768
+libplugin_secdownload_la_LDFLAGS = $(module_ldflags)
769 769
 libplugin_secdownload_la_SOURCES = $(handler_secdownload)
770 770
 
771 771
 if STATIC_HANDLER_SECDOWNLOAD
@@ -782,7 +782,7 @@ handler_empty_gif = \
782 782
 handler_empty_gif.c \
783 783
 handler_empty_gif.h
784 784
 
785  
-libplugin_empty_gif_la_LDFLAGS = $(module_ldflags)  
  785
+libplugin_empty_gif_la_LDFLAGS = $(module_ldflags)
786 786
 libplugin_empty_gif_la_SOURCES = $(handler_empty_gif)
787 787
 
788 788
 if STATIC_HANDLER_EMPTY_GIF
@@ -842,9 +842,9 @@ handler_custom_error = \
842 842
 handler_custom_error.c \
843 843
 handler_custom_error.h
844 844
 
845  
-libplugin_custom_error_la_LDFLAGS = $(module_ldflags)  
  845
+libplugin_custom_error_la_LDFLAGS = $(module_ldflags)
846 846
 libplugin_custom_error_la_SOURCES = $(handler_custom_error)
847  
-libplugin_custom_error_la_LIBADD  = libcherokee-client.la  
  847
+libplugin_custom_error_la_LIBADD  = libcherokee-client.la
848 848
 
849 849
 if STATIC_HANDLER_CUSTOM_ERROR
850 850
 static_handler_custom_error_src = $(handler_custom_error)
@@ -860,11 +860,11 @@ handler_admin = \
860 860
 handler_admin.c \
861 861
 handler_admin.h \
862 862
 admin_server.h \
863  
-admin_server.c 
  863
+admin_server.c
864 864
 
865  
-libplugin_admin_la_LDFLAGS = $(module_ldflags)  
  865
+libplugin_admin_la_LDFLAGS = $(module_ldflags)
866 866
 libplugin_admin_la_SOURCES = $(handler_admin)
867  
-libplugin_admin_la_LIBADD  = libcherokee-config.la libcherokee-client.la  
  867
+libplugin_admin_la_LIBADD  = libcherokee-config.la libcherokee-client.la
868 868
 
869 869
 if STATIC_HANDLER_ADMIN
870 870
 static_handler_admin_src = $(handler_admin)
@@ -914,7 +914,7 @@ logger_custom = \
914 914
 logger_custom.h \
915 915
 logger_custom.c
916 916
 
917  
-libplugin_custom_la_LDFLAGS = $(module_ldflags)  
  917
+libplugin_custom_la_LDFLAGS = $(module_ldflags)
918 918
 libplugin_custom_la_SOURCES = $(logger_custom)
919 919
 
920 920
 if STATIC_LOGGER_CUSTOM
@@ -931,7 +931,7 @@ logger_ncsa = \
931 931
 logger_ncsa.h \
932 932
 logger_ncsa.c
933 933
 
934  
-libplugin_ncsa_la_LDFLAGS = $(module_ldflags)  
  934
+libplugin_ncsa_la_LDFLAGS = $(module_ldflags)
935 935
 libplugin_ncsa_la_SOURCES = $(logger_ncsa)
936 936
 
937 937
 if STATIC_LOGGER_NCSA
@@ -970,7 +970,7 @@ validator_pam = \
970 970
 validator_pam.c \
971 971
 validator_pam.h
972 972
 
973  
-libplugin_pam_la_LDFLAGS = $(module_ldflags) 
  973
+libplugin_pam_la_LDFLAGS = $(module_ldflags)
974 974
 libplugin_pam_la_SOURCES = $(validator_pam)
975 975
 libplugin_pam_la_LIBADD  = -lpam
976 976
 
@@ -991,7 +991,7 @@ validator_ldap = \
991 991
 validator_ldap.c \
992 992
 validator_ldap.h
993 993
 
994  
-libplugin_ldap_la_LDFLAGS = $(module_ldflags) 
  994
+libplugin_ldap_la_LDFLAGS = $(module_ldflags)
995 995
 libplugin_ldap_la_SOURCES = $(validator_ldap)
996 996
 libplugin_ldap_la_LIBADD  = -lldap
997 997
 
@@ -1017,7 +1017,7 @@ $(validator_file_file) \
1017 1017
 validator_htpasswd.c \
1018 1018
 validator_htpasswd.h
1019 1019
 
1020  
-libplugin_htpasswd_la_LDFLAGS = $(module_ldflags) 
  1020
+libplugin_htpasswd_la_LDFLAGS = $(module_ldflags)
1021 1021
 libplugin_htpasswd_la_SOURCES = $(validator_htpasswd)
1022 1022
 libplugin_htpasswd_la_LIBADD  = $(CRYPT_LIBS)
1023 1023
 libplugin_htpasswd_la_CFLAGS  = $(CRYPT_CFLAGS)
@@ -1043,7 +1043,7 @@ $(validator_file_file) \
1043 1043
 validator_plain.c \
1044 1044
 validator_plain.h
1045 1045
 
1046  
-libplugin_plain_la_LDFLAGS = $(module_ldflags) 
  1046
+libplugin_plain_la_LDFLAGS = $(module_ldflags)
1047 1047
 libplugin_plain_la_SOURCES = $(validator_plain)
1048 1048
 
1049 1049
 if STATIC_VALIDATOR_PLAIN
@@ -1065,7 +1065,7 @@ $(validator_file_file) \
1065 1065
 validator_htdigest.c   \
1066 1066
 validator_htdigest.h
1067 1067
 
1068  
-libplugin_htdigest_la_LDFLAGS = $(module_ldflags) 
  1068
+libplugin_htdigest_la_LDFLAGS = $(module_ldflags)
1069 1069
 libplugin_htdigest_la_SOURCES = $(validator_htdigest)
1070 1070
 
1071 1071
 if STATIC_VALIDATOR_HTDIGEST
@@ -1082,7 +1082,7 @@ validator_authlist = \
1082 1082
 validator_authlist.c \
1083 1083
 validator_authlist.h
1084 1084
 
1085  
-libplugin_authlist_la_LDFLAGS = $(module_ldflags) 
  1085
+libplugin_authlist_la_LDFLAGS = $(module_ldflags)
1086 1086
 libplugin_authlist_la_SOURCES = $(validator_authlist)
1087 1087
 
1088 1088
 if STATIC_VALIDATOR_AUTHLIST
@@ -1149,7 +1149,7 @@ balancer_round_robin = \
1149 1149
 balancer_round_robin.c \
1150 1150
 balancer_round_robin.h
1151 1151
 
1152  
-libplugin_round_robin_la_LDFLAGS = $(module_ldflags) 
  1152
+libplugin_round_robin_la_LDFLAGS = $(module_ldflags)
1153 1153
 libplugin_round_robin_la_SOURCES = $(balancer_round_robin)
1154 1154
 
1155 1155
 if STATIC_BALANCER_ROUND_ROBIN
@@ -1167,7 +1167,7 @@ balancer_ip_hash = \
1167 1167
 balancer_ip_hash.c \
1168 1168
 balancer_ip_hash.h
1169 1169
 
1170  
-libplugin_ip_hash_la_LDFLAGS = $(module_ldflags) 
  1170
+libplugin_ip_hash_la_LDFLAGS = $(module_ldflags)
1171 1171
 libplugin_ip_hash_la_SOURCES = $(balancer_ip_hash)
1172 1172
 
1173 1173
 if STATIC_BALANCER_IP_HASH
@@ -1262,7 +1262,7 @@ unix4win32.c \
1262 1262
 win32_misc.h \
1263 1263
 win32_misc.c \
1264 1264
 win32_cservice.h \
1265  
-win32_cservice.c 
  1265
+win32_cservice.c
1266 1266
 endif
1267 1267
 
1268 1268
 if USE_POSIX_SHM
@@ -1387,7 +1387,7 @@ downloader_async.h \
1387 1387
 downloader_async.c
1388 1388
 
1389 1389
 
1390  
-if STATIC_HANDLER_FCGI 
  1390
+if STATIC_HANDLER_FCGI
1391 1391
    common_cgi = handler_cgi_base.h \
1392 1392
 	     	 handler_cgi_base.c
1393 1393
 endif
@@ -1562,7 +1562,7 @@ collector.c
1562 1562
 
1563 1563
 libcherokee_config_la_SOURCES = \
1564 1564
 admin_client.h \
1565  
-admin_client.c 
  1565
+admin_client.c
1566 1566
 
1567 1567
 #
1568 1568
 # Header files
@@ -1675,7 +1675,7 @@ $(dynamic_validator_authlist_lib) \
1675 1675
 $(dynamic_validator_mysql_lib) \
1676 1676
 $(dynamic_cryptor_libssl_lib) \
1677 1677
 $(dynamic_balancer_round_robin_lib) \
1678  
-$(dynamic_balancer_ip_hash_lib) 
  1678
+$(dynamic_balancer_ip_hash_lib)
1679 1679
 
1680 1680
 
1681 1681
 #
@@ -1733,7 +1733,7 @@ win32_cherokeeserv =
1733 1733
 endif
1734 1734
 
1735 1735
 win32_cherokeeserv_SOURCES = win32_cherokeeserv.c
1736  
-win32_cherokeeserv_LDADD = libcherokee-config.la libcherokee-base.la libcherokee-client.la 
  1736
+win32_cherokeeserv_LDADD = libcherokee-config.la libcherokee-base.la libcherokee-client.la
1737 1737
 
1738 1738
 #
1739 1739
 # Test programs
@@ -1741,7 +1741,7 @@ win32_cherokeeserv_LDADD = libcherokee-config.la libcherokee-base.la libcherokee
1741 1741
 noinst_PROGRAMS = $(win32_cherokeeserv)
1742 1742
 
1743 1743
 # test_SOURCES = test.c
1744  
-# test_LDADD = libcherokee-config.la libcherokee-base.la libcherokee-client.la 
  1744
+# test_LDADD = libcherokee-config.la libcherokee-base.la libcherokee-client.la
1745 1745
 
1746 1746
 
1747 1747
 CLEANFILES = \
2  cherokee/pcre/pcre.h
@@ -43,7 +43,7 @@ POSSIBILITY OF SUCH DAMAGE.
43 43
 
44 44
 #define PCRE_MAJOR          7
45 45
 #define PCRE_MINOR          3
46  
-#define PCRE_PRERELEASE     
  46
+#define PCRE_PRERELEASE
47 47
 #define PCRE_DATE           2007-08-28
48 48
 
49 49
 /* When an application links to a PCRE DLL in Windows, the symbols that are
10  cherokee/zlib/deflate.c
... ...
@@ -1,7 +1,7 @@
1 1
 /* +++ deflate.c */
2 2
 /* deflate.c -- compress data using the deflation algorithm
3 3
  * Copyright (C) 1995-1996 Jean-loup Gailly.
4  
- * For conditions of distribution and use, see copyright notice in zlib.h 
  4
+ * For conditions of distribution and use, see copyright notice in zlib.h
5 5
  */
6 6
 
7 7
 /*
@@ -303,7 +303,7 @@ int zlib_deflateReset(
303 303
 )
304 304
 {
305 305
     deflate_state *s;
306  
-    
  306
+
307 307
     if (strm == NULL || strm->state == NULL)
308 308
         return Z_STREAM_ERROR;
309 309
 
@@ -377,7 +377,7 @@ static void putShortMSB(
377 377
 {
378 378
     put_byte(s, (Byte)(b >> 8));
379 379
     put_byte(s, (Byte)(b & 0xff));
380  
-}   
  380
+}
381 381
 
382 382
 /* =========================================================================
383 383
  * Flush as much pending output as possible. All deflate() output goes
@@ -1113,7 +1113,7 @@ static block_state deflate_fast(
1113 1113
                      * always MIN_MATCH bytes ahead.
1114 1114
                      */
1115 1115
                 } while (--s->match_length != 0);
1116  
-                s->strstart++; 
  1116
+                s->strstart++;
1117 1117
             } else {
1118 1118
                 s->strstart += s->match_length;
1119 1119
                 s->match_length = 0;
@@ -1131,7 +1131,7 @@ static block_state deflate_fast(
1131 1131
             Tracevv((stderr,"%c", s->window[s->strstart]));
1132 1132
             bflush = zlib_tr_tally (s, 0, s->window[s->strstart]);
1133 1133
             s->lookahead--;
1134  
-            s->strstart++; 
  1134
+            s->strstart++;
1135 1135
         }
1136 1136
         if (bflush) FLUSH_BLOCK(s, 0);
1137 1137
     }
4  cherokee/zlib/deftree.c
... ...
@@ -1,7 +1,7 @@
1 1
 /* +++ trees.c */
2 2
 /* trees.c -- output deflated data using Huffman coding
3 3
  * Copyright (C) 1995-1996 Jean-loup Gailly
4  
- * For conditions of distribution and use, see copyright notice in zlib.h 
  4
+ * For conditions of distribution and use, see copyright notice in zlib.h
5 5
  */
6 6
 
7 7
 /*
@@ -1098,7 +1098,7 @@ static void copy_block(
1098 1098
     s->last_eob_len = 8; /* enough lookahead for inflate */
1099 1099
 
1100 1100
     if (header) {
1101  
-        put_short(s, (ush)len);   
  1101
+        put_short(s, (ush)len);
1102 1102
         put_short(s, (ush)~len);
1103 1103
 #ifdef DEBUG_ZLIB
1104 1104
         s->bits_sent += 2*16;
10  cherokee/zlib/defutil.h
... ...
@@ -1,11 +1,11 @@
1 1
 
2 2
 
3 3
 
4  
-#define Assert(err, str) 
5  
-#define Trace(dummy) 
6  
-#define Tracev(dummy) 
7  
-#define Tracecv(err, dummy) 
8  
-#define Tracevv(dummy) 
  4
+#define Assert(err, str)
  5
+#define Trace(dummy)
  6
+#define Tracev(dummy)
  7
+#define Tracecv(err, dummy)
  8
+#define Tracevv(dummy)
9 9
 
10 10
 
11 11
 
2  cherokee/zlib/zconf.h
... ...
@@ -1,6 +1,6 @@
1 1
 /* zconf.h -- configuration of the zlib compression library
2 2
  * Copyright (C) 1995-1998 Jean-loup Gailly.
3  
- * For conditions of distribution and use, see copyright notice in zlib.h 
  3
+ * For conditions of distribution and use, see copyright notice in zlib.h
4 4
  */
5 5
 
6 6
 /* @(#) $Id$ */
18  cherokee/zlib/zlib.h
@@ -37,7 +37,7 @@
37 37
 
38 38
 #define ZLIB_VERSION "1.1.3"
39 39
 
40  
-/* 
  40
+/*
41 41
      The 'zlib' compression library provides in-memory compression and
42 42
   decompression functions, including integrity checks of the uncompressed
43 43
   data.  This version of the library supports only one compression method
@@ -171,7 +171,7 @@ extern int zlib_deflate_workspacesize (void);
171 171
    returned in stream->workspace before calling zlib_deflateInit().
172 172
 */
173 173
 
174  
-/* 
  174
+/*
175 175
 extern int deflateInit (z_streamp strm, int level);
176 176
 
177 177
      Initializes the internal stream state for compression. The fields
@@ -249,7 +249,7 @@ extern int zlib_deflate (z_streamp strm, int flush);
249 249
   more input data, until it returns with Z_STREAM_END or an error. After
250 250
   deflate has returned Z_STREAM_END, the only possible operations on the
251 251
   stream are deflateReset or deflateEnd.
252  
-  
  252
+
253 253
     Z_FINISH can be used immediately after deflateInit if all the compression
254 254
   is to be done in a single step. In this case, avail_out must be at least
255 255
   0.1% larger than avail_in plus 12 bytes.  If deflate does not return
@@ -293,7 +293,7 @@ extern int zlib_inflate_workspacesize (void);
293 293
    returned in stream->workspace before calling zlib_inflateInit().
294 294
 */
295 295
 
296  
-/* 
  296
+/*
297 297
 extern int zlib_inflateInit (z_streamp strm);
298 298
 
299 299
      Initializes the internal stream state for decompression. The fields
@@ -362,7 +362,7 @@ extern int zlib_inflate (z_streamp strm, int flush);
362 362
 
363 363
      If a preset dictionary is needed at this point (see inflateSetDictionary
364 364
   below), inflate sets strm-adler to the adler32 checksum of the
365  
-  dictionary chosen by the compressor and returns Z_NEED_DICT; otherwise 
  365
+  dictionary chosen by the compressor and returns Z_NEED_DICT; otherwise
366 366
   it sets strm->adler to the adler32 checksum of all output produced
367 367
   so far (that is, total_out bytes) and returns Z_OK, Z_STREAM_END or
368 368
   an error code as described below. At the end of the stream, inflate()
@@ -400,7 +400,7 @@ extern int zlib_inflateEnd (z_streamp strm);
400 400
     The following functions are needed only in some special applications.
401 401
 */
402 402
 
403  
-/*   
  403
+/*
404 404
 extern int deflateInit2 (z_streamp strm,
405 405
                                      int  level,
406 406
                                      int  method,
@@ -443,7 +443,7 @@ extern int deflateInit2 (z_streamp strm,
443 443
    method). msg is set to null if there is no error message.  deflateInit2 does
444 444
    not perform any compression: this will be done by deflate().
445 445
 */
446  
-                            
  446
+
447 447
 extern int zlib_deflateSetDictionary (z_streamp strm,
448 448
 						     const Byte *dictionary,
449 449
 						     uInt  dictLength);
@@ -527,7 +527,7 @@ extern int zlib_deflateParams (z_streamp strm, int level, int strategy);
527 527
    if strm->avail_out was zero.
528 528
 */
529 529
 
530  
-/*   
  530
+/*
531 531
 extern int inflateInit2 (z_streamp strm, int  windowBits);
532 532
 
533 533
      This is another version of inflateInit with an extra parameter. The
@@ -569,7 +569,7 @@ extern int zlib_inflateSetDictionary (z_streamp strm,
569 569
 */
570 570
 
571 571
 extern int zlib_inflateSync (z_streamp strm);
572  
-/* 
  572
+/*
573 573
     Skips invalid compressed data until a full flush point (see above the
574 574
   description of deflate with Z_FULL_FLUSH) can be found, or until all
575 575
   available input is skipped. No output is provided.
64  contrib/05to06.py
@@ -66,7 +66,7 @@ class Syntax:
66 66
                        'directoryindex':        'directory_index',
67 67
                        'scriptalias':           'script_alias'
68 68
                        }
69  
-    
  69
+
70 70
     def __init__ (self, lex):
71 71
         self._lex = lex
72 72
 
@@ -82,7 +82,7 @@ def _process_entry_guts (self, prefix):
82 82
             print '%s!handler = %s' % (prefix, val)
83 83
 
84 84
             kind, val = self._lex.get_token()
85  
-            if kind != '{': 
  85
+            if kind != '{':
86 86
                 self._lex.rewind()
87 87
                 return True
88 88
 
@@ -93,7 +93,7 @@ def _process_entry_guts (self, prefix):
93 93
                 # Special cases
94 94
                 if kind == '}':
95 95
                     break
96  
-                
  96
+
97 97
                 elif kind == 'server':
98 98
                     kind, val_prop_val = self._lex.get_token()
99 99
                     print '%s!handler!balancer = round_robin' % (prefix)
@@ -125,7 +125,7 @@ def _process_entry_guts (self, prefix):
125 125
                     val_prop_low = val_prop.lower()
126 126
                     if val_prop_low == 'justabout':
127 127
                         print '%s!handler!just_about = 1' % (prefix)
128  
-                        continue 
  128
+                        continue
129 129
 
130 130
                     elif val_prop_low == 'env':
131 131
                         kind, val_env_name = self._lex.get_token()
@@ -135,7 +135,7 @@ def _process_entry_guts (self, prefix):
135 135
                         if kind != 'str': raise "Expected a str"
136 136
 
137 137
                         print '%s!handler!env!%s = %s' % (prefix, val_env_name, val_env_val)
138  
-                        continue 
  138
+                        continue
139 139
 
140 140
                     elif val_prop_low == 'show' or \
141 141
                          val_prop_low == 'rewrite':
@@ -150,7 +150,7 @@ def _process_entry_guts (self, prefix):
150 150
                                 print '%s!handler!date = %d' % (prefix, 'date' in val_prop)
151 151
                                 print '%s!handler!user = %d' % (prefix, 'owner' in val_prop)
152 152
                                 continue
153  
-                            
  153
+
154 154
                         # redir
155 155
                         rewrite = (kind == 'str' and val_prop.lower() == 'rewrite')
156 156
                         if not rewrite: self._lex.rewind()
@@ -175,13 +175,13 @@ def _process_entry_guts (self, prefix):
175 175
 
176 176
                         else:
177 177
                             raise "Expected a str or '}'"
178  
-                    
  178
+
179 179
                 # Default case
180 180
                 val_prop_low = val_prop.lower()
181 181
                 if val_prop_low in self.similar_entries:
182 182
                     val_prop = self.similar_entries[val_prop_low]
183 183
                 else:
184  
-                    val_prop = val_prop_low                    
  184
+                    val_prop = val_prop_low
185 185
 
186 186
                 # Get property value
187 187
                 kind, val_prop_val = self._lex.get_token()
@@ -191,7 +191,7 @@ def _process_entry_guts (self, prefix):
191 191
             kind, val = self._lex.get_token()
192 192
             if kind != 'path': raise "Malformed DocumentRoot"
193 193
             print '%s!document_root = %s' % (prefix, val)
194  
-            
  194
+
195 195
         elif kind == 'auth':
196 196
             return self._process_auth (prefix)
197 197
 
@@ -203,7 +203,7 @@ def _process_entry_guts (self, prefix):
203 203
             if not kind in ['str', 'list']: raise "Malformed Allow from"
204 204
 
205 205
             print '%s!allow_from = %s' % (prefix, val_ip)
206  
-            
  206
+
207 207
         else:
208 208
             self._lex.rewind()
209 209
             return False
@@ -226,7 +226,7 @@ def _process_auth (self, prefix):
226 226
             if kind == 'user':
227 227
                 kind = 'str'
228 228
                 val_prop_name = 'user'
229  
-            
  229
+
230 230
             if kind == '}':
231 231
                 self._lex.rewind()
232 232
                 break
@@ -259,7 +259,7 @@ def _process_auth (self, prefix):
259 259
                     kind, val_val = self._lex.get_token()
260 260
                     print "%s!auth!%s = %s" % (prefix, val_prop, val_val)
261 261
             else:
262  
-                self._lex.rewind()            
  262
+                self._lex.rewind()
263 263
 
264 264
         kind, val = self._lex.get_token()
265 265
         if kind != '}' : raise "Malformed Auth"
@@ -281,7 +281,7 @@ def _process_entry (self, prefix):
281 281
     def _process_encoder (self, prefix):
282 282
         while True:
283 283
             kind, val = self._lex.get_token()
284  
-            if kind not in ['allow', 'deny']: 
  284
+            if kind not in ['allow', 'deny']:
285 285
                 raise "Malformed encoder"
286 286
 
287 287
             kind_val, val_val = self._lex.get_token()
@@ -313,7 +313,7 @@ def _process_log (self, prefix):
313 313
 
314 314
             kind, val2 = self._lex.get_token()
315 315
             if kind != 'path': raise "Malformed Log"
316  
-            
  316
+
317 317
             if val2[0] == '/' or val2[1:2] == ':\\':
318 318
                 print "%s!%s!type = file" % (prefix, entry)
319 319
                 print "%s!%s!filename = %s" % (prefix, entry, val2)
@@ -372,7 +372,7 @@ def _process_icons_content (self):
372 372
                 print "icons!suffix!%s = %s" % (val_file, val_suffixes)
373 373
 
374 374
         else:
375  
-            self._lex.rewind()            
  375
+            self._lex.rewind()
376 376
             return False
377 377
 
378 378
         return True
@@ -466,7 +466,7 @@ def _process_virtual_server_content (self, vserver='default'):
466 466
         elif kind == 'errorhandler':
467 467
             kind, handler_val = self._lex.get_token()
468 468
             if kind != 'str': raise "Malformed ErrorHandler"
469  
-            
  469
+
470 470
             kind, val = self._lex.get_token()
471 471
             if kind != '{': raise "Malformed ErrorHandler"
472 472
 
@@ -486,14 +486,14 @@ def _process_virtual_server_content (self, vserver='default'):
486 486
                     raise "Malformed ErrorHandler"
487 487
 
488 488
                 print "%s!%s = %s" % (prefix, error_val, url_val)
489  
-            
  489
+
490 490
             kind, val = self._lex.get_token()
491 491
             if kind != '}': raise "Malformed ErrorHandler"
492 492
 
493 493
         elif kind == 'log':
494 494
             kind, log_val = self._lex.get_token()
495 495
             if kind != 'str': raise "Malformed Log"
496  
-            
  496
+
497 497
             kind, val = self._lex.get_token()
498 498
             if kind != '{':
499 499
                 self._lex.rewind()
@@ -507,7 +507,7 @@ def _process_virtual_server_content (self, vserver='default'):
507 507
             if kind != '}': raise "Malformed Log"
508 508
 
509 509
         else:
510  
-            self._lex.rewind()            
  510
+            self._lex.rewind()
511 511
             return False
512 512
 
513 513
         return True
@@ -541,7 +541,7 @@ def _process_server_content (self):
541 541
         elif kind == 'encoder':
542 542
             kind, enc_val = self._lex.get_token()
543 543
             if kind != 'str': raise "Malformed encoder"
544  
-            
  544
+
545 545
             kind, val = self._lex.get_token()
546 546
             if kind != '{': raise "Malformed encoder"
547 547
 
@@ -569,7 +569,7 @@ def _process_server_content (self):
569 569
             kind, val_type = self._lex.get_token()
570 570
             if kind != 'policy':
571 571
                 raise "Malformed threadnumber"
572  
-            
  572
+
573 573
             kind, val_val = self._lex.get_token()
574 574
             if kind != 'str': raise "Malformed threadnumber"
575 575
 
@@ -590,7 +590,7 @@ def _process_server_content (self):
590 590
                     raise "Malformed Sendfile"
591 591
 
592 592
                 val = val.lower()
593  
-                
  593
+
594 594
                 if val == 'minsize':
595 595
                     kind, val_num = self._lex.get_token()
596 596
                     if kind != 'int': raise "Malformed Sendfile"
@@ -602,12 +602,12 @@ def _process_server_content (self):
602 602
                     if kind != 'int': raise "Malformed Sendfile"
603 603
 
604 604
                     print "server!sendfile_max = %s" % (val_num)
605  
-                    
  605
+
606 606
                 else:
607 607
                     raise "Malformed Sendfile"
608 608
 
609 609
         else:
610  
-            self._lex.rewind()            
  610
+            self._lex.rewind()
611 611
             return False
612 612
 
613 613
         return True
@@ -655,7 +655,7 @@ def process_sentence (self):
655 655
         kind, val = self._lex.get_token()
656 656
         if kind == None: return False
657 657
         self._lex.rewind()
658  
-        
  658
+
659 659
         # Global server stuff
660 660
         ok = self._process_server_content ()
661 661
         if ok: return True
@@ -692,10 +692,10 @@ class Lexer:
692 692
     special_strings = ['server_info']
693 693
 
694 694
     reserved_words = ['{', '}', 'porttls', 'port', 'directoryindex', 'directory', 'extension',
695  
-                      'request', 'handler', 'ipv6', 'timeout', 'keepalive', 'logflushinterval', 
  695
+                      'request', 'handler', 'ipv6', 'timeout', 'keepalive', 'logflushinterval',
696 696
                       'maxkeepaliverequests', 'servertokens', 'encoder', 'log', 'server',
697 697
                       'allow', 'deny', 'pidfile', 'icons', 'mimefile', 'errorhandler', 'auth',
698  
-                      'include', 'listenqueuesize', 'listen', 'userdir', 'user','group', 'chroot', 
  698
+                      'include', 'listenqueuesize', 'listen', 'userdir', 'user','group', 'chroot',
699 699
                       'maxfds', 'maxconnectionreuse', 'panicaction', 'pollmethod', 'documentroot',
700 700
                       'threadnumber', 'policy', 'sendfile', 'file', 'suffix', 'parentdirectory',
701 701
                       'default', 'sslcertificatefile', 'sslcertificatekeyfile', 'sslcalistfile']
@@ -704,7 +704,7 @@ def __init__ (self, txt):
704 704
         self._txt      = txt
705 705
         self._last     = None,None
706 706
         self._rewinded = False
707  
-        
  707
+
708 708
     def _find_consume (self, s):
709 709
         found = (self._txt.lower().find (s.lower()) == 0)
710 710
         if not found: return False
@@ -739,7 +739,7 @@ def _get_word (self):
739 739
             while self._txt[0] in " \t":
740 740
                 self._txt = self._txt[1:]
741 741
         return word
742  
-        
  742
+
743 743
     def rewind (self):
744 744
         self._rewinded = True
745 745
 
@@ -747,7 +747,7 @@ def get_token (self):
747 747
         if self._rewinded:
748 748
             self._rewinded = False
749 749
             return self._last
750  
-        
  750
+
751 751
         self._last = self._get_token_guts()
752 752
         return self._last
753 753
 
@@ -817,7 +817,7 @@ def convert (self):
817 817
         tmp = filter (lambda x: len(x) > 0 and x[0] != '#',
818 818
                       map (lambda x: x.strip(),
819 819
                            self._in.readlines()))
820  
-        if not len(tmp): return 
  820
+        if not len(tmp): return
821 821
 
822 822
         incoming = reduce (lambda x,y: x+' '+y, tmp)
823 823
         self.lex = Lexer (incoming)
@@ -828,6 +828,6 @@ def convert (self):
828 828
 def main ():
829 829
     c = Converter (sys.stdin, sys.stdout)
830 830
     c.convert()
831  
-    
  831
+
832 832
 if __name__ == "__main__":
833 833
     main()
10  contrib/06to07.py
@@ -14,7 +14,7 @@
14 14
 
15 15
 def reparent_child (orig, target):
16 16
     if not orig:
17  
-        return 
  17
+        return
18 18
 
19 19
     for p in orig._child:
20 20
         if p == 'priority':
@@ -47,7 +47,7 @@ def convert (fin, fout):
47 47
                 else:
48 48
                     cin['vserver!%s!rule!%s!match!type'     %(vserver, prio)] = 'directory'
49 49
                     cin['vserver!%s!rule!%s!match!directory'%(vserver, prio)] = _dir
50  
-                reparent_child (cin['vserver!%s!directory!%s'%(vserver, _dir)], 
  50
+                reparent_child (cin['vserver!%s!directory!%s'%(vserver, _dir)],
51 51
                                 cin['vserver!%s!rule!%s'     %(vserver, prio)])
52 52
 
53 53
         exts = cin['vserver!%s!extensions'%(vserver)]
@@ -56,7 +56,7 @@ def convert (fin, fout):
56 56
                 prio = cin.get_val('vserver!%s!extensions!%s!priority'%(vserver, ext))
57 57
                 cin['vserver!%s!rule!%s!match!type'      %(vserver, prio)] = 'extensions'
58 58
                 cin['vserver!%s!rule!%s!match!extensions'%(vserver, prio)] = ext
59  
-                reparent_child (cin['vserver!%s!extensions!%s'%(vserver, ext)], 
  59
+                reparent_child (cin['vserver!%s!extensions!%s'%(vserver, ext)],
60 60
                                 cin['vserver!%s!rule!%s'      %(vserver, prio)])
61 61
 
62 62
         reqs = cin['vserver!%s!request'%(vserver)]
@@ -65,7 +65,7 @@ def convert (fin, fout):
65 65
                 prio = cin.get_val('vserver!%s!request!%s!priority'%(vserver, req))
66 66
                 cin['vserver!%s!rule!%s!match!type'   %(vserver, prio)] = 'request'
67 67
                 cin['vserver!%s!rule!%s!match!request'%(vserver, prio)] = req
68  
-                reparent_child (cin['vserver!%s!request!%s'%(vserver, req)], 
  68
+                reparent_child (cin['vserver!%s!request!%s'%(vserver, req)],
69 69
                                 cin['vserver!%s!rule!%s'   %(vserver, prio)])
70 70
 
71 71
         del (cin["vserver!%s!directory" %(vserver)])
@@ -77,6 +77,6 @@ def convert (fin, fout):
77 77
 
78 78
 def main ():
79 79
     convert (sys.argv[1], sys.argv[2])
80  
-    
  80
+
81 81
 if __name__ == "__main__":
82 82
     main()
6  contrib/07to08.py
@@ -45,7 +45,7 @@ def convert (fin, fout):
45 45
             prio = 1
46 46
         else:
47 47
             n += 1
48  
-            prio = n 
  48
+            prio = n