lighttpd-branch.diff

   1 Index: configure.in
   2 ===================================================================
   3 --- configure.in        (.../tags/lighttpd-1.4.16)      (revision 1922)
   4 +++ configure.in        (.../branches/lighttpd-1.4.x)   (revision 1922)
   5 @@ -1,7 +1,7 @@
   6  #                                               -*- Autoconf -*-
   7  # Process this file with autoconf to produce a configure script.
   8  AC_PREREQ(2.57)
   9 -AC_INIT(lighttpd, 1.4.15, jan@kneschke.de)
  10 +AC_INIT(lighttpd, 1.4.17, jan@kneschke.de)
  11  AC_CONFIG_SRCDIR([src/server.c])
  12
  13  AC_CANONICAL_TARGET
  14 Index: src/connections.c
  15 ===================================================================
  16 --- src/connections.c   (.../tags/lighttpd-1.4.16)      (revision 1922)
  17 +++ src/connections.c   (.../branches/lighttpd-1.4.x)   (revision 1922)
  18 @@ -1412,42 +1412,42 @@
  19
  20                         switch (r = http_response_prepare(srv, con)) {
  21                         case HANDLER_FINISHED:
  22 -                               if (con->http_status == 404 ||
  23 -                                   con->http_status == 403) {
  24 -                                       /* 404 error-handler */
  25 +                               if (con->mode == DIRECT) {
  26 +                                       if (con->http_status == 404 ||
  27 +                                           con->http_status == 403) {
  28 +                                               /* 404 error-handler */
  29
  30 -                                       if (con->in_error_handler == 0 &&
  31 -                                           (!buffer_is_empty(con->conf.error_handler) ||
  32 -                                            !buffer_is_empty(con->error_handler))) {
  33 -                                               /* call error-handler */
  34 +                                               if (con->in_error_handler == 0 &&
  35 +                                                   (!buffer_is_empty(con->conf.error_handler) ||
  36 +                                                    !buffer_is_empty(con->error_handler))) {
  37 +                                                       /* call error-handler */
  38
  39 -                                               con->error_handler_saved_status = con->http_status;
  40 -                                               con->http_status = 0;
  41 +                                                       con->error_handler_saved_status = con->http_status;
  42 +                                                       con->http_status = 0;
  43
  44 -                                               if (buffer_is_empty(con->error_handler)) {
  45 -                                                       buffer_copy_string_buffer(con->request.uri, con->conf.error_handler);
  46 -                                               } else {
  47 -                                                       buffer_copy_string_buffer(con->request.uri, con->error_handler);
  48 -                                               }
  49 -                                               buffer_reset(con->physical.path);
  50 +                                                       if (buffer_is_empty(con->error_handler)) {
  51 +                                                               buffer_copy_string_buffer(con->request.uri, con->conf.error_handler);
  52 +                                                       } else {
  53 +                                                               buffer_copy_string_buffer(con->request.uri, con->error_handler);
  54 +                                                       }
  55 +                                                       buffer_reset(con->physical.path);
  56
  57 -                                               con->in_error_handler = 1;
  58 +                                                       con->in_error_handler = 1;
  59
  60 -                                               connection_set_state(srv, con, CON_STATE_HANDLE_REQUEST);
  61 +                                                       connection_set_state(srv, con, CON_STATE_HANDLE_REQUEST);
  62
  63 -                                               done = -1;
  64 -                                               break;
  65 +                                                       done = -1;
  66 +                                                       break;
  67 +                                               } else if (con->in_error_handler) {
  68 +                                                       /* error-handler is a 404 */
  69 +
  70 +                                                       con->http_status = con->error_handler_saved_status;
  71 +                                               }
  72                                         } else if (con->in_error_handler) {
  73 -                                               /* error-handler is a 404 */
  74 -
  75 -                                               con->http_status = con->error_handler_saved_status;
  76 +                                               /* error-handler is back and has generated content */
  77 +                                               /* if Status: was set, take it otherwise use 200 */
  78                                         }
  79 -                               } else if (con->in_error_handler) {
  80 -                                       /* error-handler is back and has generated content */
  81 -                                       /* if Status: was set, take it otherwise use 200 */
  82 -                                       con->http_status = con->error_handler_saved_status;
  83                                 }
  84 -
  85                                 if (con->http_status == 0) con->http_status = 200;
  86
  87                                 /* we have something to send, go on */
  88 Index: src/mod_staticfile.c
  89 ===================================================================
  90 --- src/mod_staticfile.c        (.../tags/lighttpd-1.4.16)      (revision 1922)
  91 +++ src/mod_staticfile.c        (.../branches/lighttpd-1.4.x)   (revision 1922)
  92 @@ -506,6 +506,7 @@
  93          */
  94         http_chunk_append_file(srv, con, con->physical.path, 0, sce->st.st_size);
  95
  96 +       con->http_status = 200;
  97         con->file_finished = 1;
  98
  99         return HANDLER_FINISHED;
 100 Index: src/etag.c
 101 ===================================================================
 102 --- src/etag.c  (.../tags/lighttpd-1.4.16)      (revision 1922)
 103 +++ src/etag.c  (.../branches/lighttpd-1.4.x)   (revision 1922)
 104 @@ -1,4 +1,5 @@
 105  #include <string.h>
 106 +#include <stdint.h>
 107
 108  #include "buffer.h"
 109  #include "etag.h"
 110 @@ -31,7 +32,8 @@
 111  }
 112
 113  int etag_mutate(buffer *mut, buffer *etag) {
 114 -       size_t h, i;
 115 +       size_t i;
 116 +       uint32_t h;
 117
 118         for (h=0, i=0; i < etag->used; ++i) h = (h<<5)^(h>>27)^(etag->ptr[i]);
 119
 120 Index: src/mod_mysql_vhost.c
 121 ===================================================================
 122 --- src/mod_mysql_vhost.c       (.../tags/lighttpd-1.4.16)      (revision 1922)
 123 +++ src/mod_mysql_vhost.c       (.../branches/lighttpd-1.4.x)   (revision 1922)
 124 @@ -252,6 +252,11 @@
 125
 126                                 return HANDLER_ERROR;
 127                         }
 128 +
 129 +                       /* in mysql versions above 5.0.3 the reconnect flag is off by default */
 130 +                       my_bool reconnect = 1;
 131 +                       mysql_options(s->mysql, MYSQL_OPT_RECONNECT, &reconnect);
 132 +
 133  #define FOO(x) (s->x->used ? s->x->ptr : NULL)
 134
 135                         if (!mysql_real_connect(s->mysql, FOO(hostname), FOO(myuser), FOO(mypass),
 136 Index: src/mod_compress.c
 137 ===================================================================
 138 --- src/mod_compress.c  (.../tags/lighttpd-1.4.16)      (revision 1922)
 139 +++ src/mod_compress.c  (.../branches/lighttpd-1.4.x)   (revision 1922)
 140 @@ -589,6 +589,13 @@
 141         /* don't compress files that are too large as we need to much time to handle them */
 142         if (max_fsize && (sce->st.st_size >> 10) > max_fsize) return HANDLER_GO_ON;
 143
 144 +       /* don't try to compress files less than 128 bytes
 145 +        *
 146 +        * - extra overhead for compression
 147 +        * - mmap() fails for st_size = 0 :)
 148 +        */
 149 +       if (sce->st.st_size < 128) return HANDLER_GO_ON;
 150 +
 151         /* check if mimetype is in compress-config */
 152         for (m = 0; m < p->conf.compress->used; m++) {
 153                 data_string *compress_ds = (data_string *)p->conf.compress->data[m];
 154 Index: src/mod_dirlisting.c
 155 ===================================================================
 156 --- src/mod_dirlisting.c        (.../tags/lighttpd-1.4.16)      (revision 1922)
 157 +++ src/mod_dirlisting.c        (.../branches/lighttpd-1.4.x)   (revision 1922)
 158 @@ -59,6 +59,7 @@
 159
 160         buffer *external_css;
 161         buffer *encoding;
 162 +       buffer *set_footer;
 163  } plugin_config;
 164
 165  typedef struct {
 166 @@ -173,6 +174,7 @@
 167                         excludes_buffer_free(s->excludes);
 168                         buffer_free(s->external_css);
 169                         buffer_free(s->encoding);
 170 +                       buffer_free(s->set_footer);
 171
 172                         free(s);
 173                 }
 174 @@ -240,7 +242,9 @@
 175  #define CONFIG_SHOW_HEADER      "dir-listing.show-header"
 176  #define CONFIG_HIDE_HEADER_FILE "dir-listing.hide-header-file"
 177  #define CONFIG_DIR_LISTING      "server.dir-listing"
 178 +#define CONFIG_SET_FOOTER       "dir-listing.set-footer"
 179
 180 +
 181  SETDEFAULTS_FUNC(mod_dirlisting_set_defaults) {
 182         plugin_data *p = p_d;
 183         size_t i = 0;
 184 @@ -256,6 +260,7 @@
 185                 { CONFIG_SHOW_HEADER,      NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 7 */
 186                 { CONFIG_HIDE_HEADER_FILE, NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 8 */
 187                 { CONFIG_DIR_LISTING,      NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 9 */
 188 +               { CONFIG_SET_FOOTER,       NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION }, /* 10 */
 189
 190                 { NULL,                          NULL, T_CONFIG_UNSET, T_CONFIG_SCOPE_UNSET }
 191         };
 192 @@ -278,6 +283,7 @@
 193                 s->show_header = 0;
 194                 s->hide_header_file = 0;
 195                 s->encoding = buffer_init();
 196 +               s->set_footer = buffer_init();
 197
 198                 cv[0].destination = s->excludes;
 199                 cv[1].destination = &(s->dir_listing);
 200 @@ -289,6 +295,7 @@
 201                 cv[7].destination = &(s->show_header);
 202                 cv[8].destination = &(s->hide_header_file);
 203                 cv[9].destination = &(s->dir_listing); /* old name */
 204 +               cv[10].destination = s->set_footer;
 205
 206                 p->config_storage[i] = s;
 207                 ca = ((data_config *)srv->config_context->data[i])->value;
 208 @@ -318,6 +325,7 @@
 209         PATCH(show_header);
 210         PATCH(hide_header_file);
 211         PATCH(excludes);
 212 +       PATCH(set_footer);
 213
 214         /* skip the first, the global context */
 215         for (i = 1; i < srv->config_context->used; i++) {
 216 @@ -348,6 +356,8 @@
 217                                 PATCH(show_header);
 218                         } else if (buffer_is_equal_string(du->key, CONST_STR_LEN(CONFIG_HIDE_HEADER_FILE))) {
 219                                 PATCH(hide_header_file);
 220 +                       } else if (buffer_is_equal_string(du->key, CONST_STR_LEN(CONFIG_SET_FOOTER))) {
 221 +                               PATCH(set_footer);
 222                         } else if (buffer_is_equal_string(du->key, CONST_STR_LEN(CONFIG_EXCLUDE))) {
 223                                 PATCH(excludes);
 224                         }
 225 @@ -467,8 +477,7 @@
 226                         "h2 {margin-bottom: 12px;}\n"
 227                         "table {margin-left: 12px;}\n"
 228                         "th, td {"
 229 -                       " font-family: \"Courier New\", Courier, monospace;"
 230 -                       " font-size: 10pt;"
 231 +                       " font: 90% monospace;"
 232                         " text-align: left;"
 233                         "}\n"
 234                         "th {"
 235 @@ -488,8 +497,7 @@
 236                         " padding-bottom: 14px;"
 237                         "}\n"
 238                         "div.foot {"
 239 -                       " font-family: \"Courier New\", Courier, monospace;"
 240 -                       " font-size: 10pt;"
 241 +                       " font: 90% monospace;"
 242                         " color: #787878;"
 243                         " padding-top: 4px;"
 244                         "}\n"
 245 @@ -569,7 +577,9 @@
 246                 "<div class=\"foot\">"
 247         );
 248
 249 -       if (buffer_is_empty(con->conf.server_tag)) {
 250 +       if (p->conf.set_footer->used > 1) {
 251 +               buffer_append_string_buffer(out, p->conf.set_footer);
 252 +       } else if (buffer_is_empty(con->conf.server_tag)) {
 253                 BUFFER_APPEND_STRING_CONST(out, PACKAGE_NAME "/" PACKAGE_VERSION);
 254         } else {
 255                 buffer_append_string_buffer(out, con->conf.server_tag);
 256 Index: tests/404-handler.conf
 257 ===================================================================
 258 --- tests/404-handler.conf      (.../tags/lighttpd-1.4.16)      (revision 0)
 259 +++ tests/404-handler.conf      (.../branches/lighttpd-1.4.x)   (revision 1922)
 260 @@ -0,0 +1,49 @@
 261 +debug.log-request-handling   = "enable"
 262 +debug.log-response-header   = "enable"
 263 +debug.log-request-header   = "enable"
 264 +
 265 +server.document-root         = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/"
 266 +server.pid-file              = env.SRCDIR + "/tmp/lighttpd/lighttpd.pid"
 267 +
 268 +## bind to port (default: 80)
 269 +server.port                 = 2048
 270 +
 271 +## bind to localhost (default: all interfaces)
 272 +server.bind                = "localhost"
 273 +server.errorlog            = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.error.log"
 274 +server.name                = "www.example.org"
 275 +server.tag                 = "Apache 1.3.29"
 276 +
 277 +
 278 +server.modules              = (
 279 +                                 "mod_fastcgi",
 280 +                                 "mod_cgi",
 281 +                               "mod_accesslog" )
 282 +
 283 +######################## MODULE CONFIG ############################
 284 +
 285 +
 286 +accesslog.filename          = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.access.log"
 287 +
 288 +mimetype.assign             = ( ".html" => "text/html" )
 289 +
 290 +cgi.assign = (".pl" => "/usr/bin/perl" )
 291 +
 292 +# fastcgi.server += ( "/404.pl" =>
 293 +#                    ( "404-handler" =>
 294 +#                      (
 295 +#                        "socket" => env.SRCDIR + "/tmp/pl-404-fastcgi-1.socket",
 296 +#                        "bin-path" => server.document-root + "/404.pl",
 297 +#                        "max-procs" => 1,
 298 +#                        "check-local" => "disable",
 299 +#                        "broken-scriptfilename" => "enable",
 300 +#                      )
 301 +#                    ),
 302 +#                  )
 303 +
 304 +$HTTP["url"] =~ "^/static/" {
 305 +  server.error-handler-404 = "/404.html"
 306 +}
 307 +else $HTTP["url"] =~ "." {
 308 +  server.error-handler-404 = "/404.pl"
 309 +}
 310 Index: tests/mod-cgi.t
 311 ===================================================================
 312 --- tests/mod-cgi.t     (.../tags/lighttpd-1.4.16)      (revision 1922)
 313 +++ tests/mod-cgi.t     (.../branches/lighttpd-1.4.x)   (revision 1922)
 314 @@ -8,7 +8,7 @@
 315
 316  use strict;
 317  use IO::Socket;
 318 -use Test::More tests => 15;
 319 +use Test::More tests => 16;
 320  use LightyTest;
 321
 322  my $tf = LightyTest->new();
 323 @@ -115,6 +115,13 @@
 324   );
 325  $t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.1', 'HTTP-Status' => 200, '+Content-Length' => '' } ];
 326  ok($tf->handle_http($t) == 0, 'cgi-env: HTTP_HOST');
 327 +# broken header crash
 328 +$t->{REQUEST}  = ( <<EOF
 329 +GET /crlfcrash.pl HTTP/1.0
 330 +EOF
 331 + );
 332 +$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 500 } ];
 333 +ok($tf->handle_http($t) == 0, 'broken header via perl cgi');
 334
 335  ok($tf->stop_proc == 0, "Stopping lighttpd");
 336
 337 Index: tests/docroot/www/crlfcrash.pl
 338 ===================================================================
 339 --- tests/docroot/www/crlfcrash.pl      (.../tags/lighttpd-1.4.16)      (revision 0)
 340 +++ tests/docroot/www/crlfcrash.pl      (.../branches/lighttpd-1.4.x)   (revision 1922)
 341 @@ -0,0 +1,4 @@
 342 +#!/usr/bin/env perl
 343 +#
 344 +print "Location: http://www.example.org/\r\n\n\n";
 345 +exit;
 346 Index: tests/docroot/www/404.pl
 347 ===================================================================
 348 --- tests/docroot/www/404.pl    (.../tags/lighttpd-1.4.16)      (revision 0)
 349 +++ tests/docroot/www/404.pl    (.../branches/lighttpd-1.4.x)   (revision 1922)
 350 @@ -0,0 +1,33 @@
 351 +#!/usr/bin/perl
 352 +use CGI qw/:standard/;
 353 +my $cgi = new CGI;
 354 +my $request_uri = $ENV{'REQUEST_URI'};
 355 +print (STDERR "REQUEST_URI: $request_uri\n");
 356 +
 357 +if ($request_uri =~ m/^\/dynamic\/200\// ) {
 358 +  print header ( -status => 200,
 359 +                 -type   => 'text/plain' );
 360 +  print ("found here\n");
 361 +}
 362 +elsif ($request_uri =~ m|^/dynamic/302/| ) {
 363 +  print header( -status=>302,
 364 +                -location => 'http://www.example.org/');
 365 +}
 366 +elsif ($request_uri =~ m/^\/dynamic\/404\// ) {
 367 +  print header ( -status => 404
 368 +                 -type   => 'text/plain' );
 369 +  print ("Not found here\n");
 370 +}
 371 +elsif ($request_uri =~ m/^\/send404\.pl/ ) {
 372 +  print header ( -status => 404
 373 +                 -type   => 'text/plain' );
 374 +  print ("Not found here (send404)\n");
 375 +}
 376 +elsif ($request_uri =~ m/^\/dynamic\/nostatus\// ) {
 377 +  print ("found here\n");
 378 +}
 379 +else {
 380 +  print header ( -status => 500,
 381 +                 -type   => 'text/plain');
 382 +  print ("huh\n");
 383 +};
 384
 385 Property changes on: tests/docroot/www/404.pl
 386 ___________________________________________________________________
 387 Name: svn:executable
 388    + *
 389
 390 Index: tests/docroot/www/send404.pl
 391 ===================================================================
 392 --- tests/docroot/www/send404.pl        (.../tags/lighttpd-1.4.16)      (revision 0)
 393 +++ tests/docroot/www/send404.pl        (.../branches/lighttpd-1.4.x)   (revision 1922)
 394 @@ -0,0 +1,5 @@
 395 +#!/usr/bin/perl
 396 +use CGI qw/:standard/;
 397 +print header ( -status => 404
 398 +               -type   => 'text/plain' );
 399 +print ("send404\n");
 400
 401 Property changes on: tests/docroot/www/send404.pl
 402 ___________________________________________________________________
 403 Name: svn:executable
 404    + *
 405
 406 Index: tests/docroot/www/404.html
 407 ===================================================================
 408 --- tests/docroot/www/404.html  (.../tags/lighttpd-1.4.16)      (revision 0)
 409 +++ tests/docroot/www/404.html  (.../branches/lighttpd-1.4.x)   (revision 1922)
 410 @@ -0,0 +1 @@
 411 +static not found
 412 Index: tests/docroot/www/404.fcgi
 413 ===================================================================
 414 --- tests/docroot/www/404.fcgi  (.../tags/lighttpd-1.4.16)      (revision 0)
 415 +++ tests/docroot/www/404.fcgi  (.../branches/lighttpd-1.4.x)   (revision 1922)
 416 @@ -0,0 +1,27 @@
 417 +#!/usr/bin/perl
 418 +#use CGI qw/:standard/;
 419 +use CGI::Fast qw(:standard);
 420 +my $cgi = new CGI;
 421 +while (new CGI::Fast) {
 422 +    my $request_uri = $ENV{'REQUEST_URI'};
 423 +    print (STDERR "REQUEST_URI: $request_uri\n");
 424 +    if ($request_uri =~ m/^\/dynamic\/200\// ) {
 425 +      print header ( -status => 200,
 426 +                     -type   => 'text/plain' );
 427 +      print ("found here\n");
 428 +    }
 429 +    elsif ($request_uri =~ m|^/dynamic/302/| ) {
 430 +      print header( -status=>302,
 431 +                    -location => 'http://www.example.org/');
 432 +    }
 433 +    elsif ($request_uri =~ m/^\/dynamic\/404\// ) {
 434 +      print header ( -status => 404
 435 +                     -type   => 'text/plain' );
 436 +      print ("Not found here\n");
 437 +    }
 438 +    else {
 439 +      print header ( -status => 500,
 440 +                     -type   => 'text/plain');
 441 +      print ("huh\n");
 442 +    };
 443 +};
 444
 445 Property changes on: tests/docroot/www/404.fcgi
 446 ___________________________________________________________________
 447 Name: svn:executable
 448    + *
 449
 450 Index: tests/core-404-handler.t
 451 ===================================================================
 452 --- tests/core-404-handler.t    (.../tags/lighttpd-1.4.16)      (revision 0)
 453 +++ tests/core-404-handler.t    (.../branches/lighttpd-1.4.x)   (revision 1922)
 454 @@ -0,0 +1,76 @@
 455 +#!/usr/bin/env perl
 456 +#
 457 +# combinations we have to test:
 458 +# plain 404 case
 459 +# 404-handler -> static file (verify content)
 460 +# 404-handler -> fastcgi
 461 +#   returning 200
 462 +#   returning 302 + Location
 463 +#   returning 404
 464 +#   returning no status -> 200
 465 +#
 466 +BEGIN {
 467 +    # add current source dir to the include-path
 468 +    # we need this for make distcheck
 469 +   (my $srcdir = $0) =~ s#/[^/]+$#/#;
 470 +   unshift @INC, $srcdir;
 471 +}
 472 +
 473 +use strict;
 474 +use IO::Socket;
 475 +use Test::More tests => 8;
 476 +use LightyTest;
 477 +
 478 +my $tf = LightyTest->new();
 479 +my $t;
 480 +$tf->{CONFIGFILE} = '404-handler.conf';
 481 +
 482 +ok($tf->start_proc == 0, "Starting lighttpd") or die();
 483 +
 484 +$t->{REQUEST}  = ( <<EOF
 485 +GET /static/notfound HTTP/1.0
 486 +EOF
 487 + );
 488 +$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, 'HTTP-Content' => "static not found\n" } ];
 489 +ok($tf->handle_http($t) == 0, '404 handler => static');
 490 +
 491 +#
 492 +#
 493 +#
 494 +$t->{REQUEST}  = ( <<EOF
 495 +GET /dynamic/200/notfound HTTP/1.0
 496 +EOF
 497 + );
 498 +$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, 'HTTP-Content' => "found here\n" } ];
 499 +ok($tf->handle_http($t) == 0, '404 handler => dynamic(200)');
 500 +
 501 +$t->{REQUEST}  = ( <<EOF
 502 +GET /dynamic/302/notfound HTTP/1.0
 503 +EOF
 504 + );
 505 +$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 302, 'Location' => "http://www.example.org/" } ];
 506 +ok($tf->handle_http($t) == 0, '404 handler => dynamic(302)');
 507 +
 508 +$t->{REQUEST}  = ( <<EOF
 509 +GET /dynamic/404/notfound HTTP/1.0
 510 +EOF
 511 + );
 512 +$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 404, 'HTTP-Content' => "Not found here\n" } ];
 513 +ok($tf->handle_http($t) == 0, '404 handler => dynamic(404)');
 514 +
 515 +$t->{REQUEST}  = ( <<EOF
 516 +GET /dynamic/nostatus/notfound HTTP/1.0
 517 +EOF
 518 + );
 519 +$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, 'HTTP-Content' => "found here\n" } ];
 520 +ok($tf->handle_http($t) == 0, '404 handler => dynamic(nostatus)');
 521 +
 522 +$t->{REQUEST}  = ( <<EOF
 523 +GET /send404.pl HTTP/1.0
 524 +EOF
 525 + );
 526 +$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 404, 'HTTP-Content' => "send404\n" } ];
 527 +ok($tf->handle_http($t) == 0, '404 generated by CGI should stay 404');
 528 +
 529 +ok($tf->stop_proc == 0, "Stopping lighttpd");
 530 +
 531 Index: doc/lighttpd.conf
 532 ===================================================================
 533 --- doc/lighttpd.conf   (.../tags/lighttpd-1.4.16)      (revision 1922)
 534 +++ doc/lighttpd.conf   (.../branches/lighttpd-1.4.x)   (revision 1922)
 535 @@ -37,10 +37,10 @@
 536
 537  ## a static document-root, for virtual-hosting take look at the
 538  ## server.virtual-* options
 539 -server.document-root        = "/www/pages/"
 540 +server.document-root        = "/srv/www/htdocs/"
 541
 542  ## where to send error-messages to
 543 -server.errorlog             = "/www/logs/lighttpd.error.log"
 544 +server.errorlog             = "/var/log/lighttpd/error.log"
 545
 546  # files to check for if .../ is requested
 547  index-file.names            = ( "index.php", "index.html",
 548 @@ -101,7 +101,9 @@
 549    ".wmv"          =>      "video/x-ms-wmv",
 550    ".bz2"          =>      "application/x-bzip",
 551    ".tbz"          =>      "application/x-bzip-compressed-tar",
 552 -  ".tar.bz2"      =>      "application/x-bzip-compressed-tar"
 553 +  ".tar.bz2"      =>      "application/x-bzip-compressed-tar",
 554 +  # default mime type
 555 +  ""              =>      "application/octet-stream",
 556   )
 557
 558  # Use the "Content-Type" extended attribute to obtain mime type if possible
 559 @@ -113,7 +115,7 @@
 560  # server.tag                 = "lighttpd"
 561
 562  #### accesslog module
 563 -accesslog.filename          = "/www/logs/access.log"
 564 +accesslog.filename          = "/var/log/lighttpd/access.log"
 565
 566  ## deny access the file-extensions
 567  #
 568 @@ -138,7 +140,7 @@
 569  #server.port                = 81
 570
 571  ## bind to localhost (default: all interfaces)
 572 -#server.bind                = "grisu.home.kneschke.de"
 573 +#server.bind                = "127.0.0.1"
 574
 575  ## error-handler for status 404
 576  #server.error-handler-404   = "/error-handler.html"
 577 @@ -158,15 +160,16 @@
 578  ## or
 579  ##   virtual-server-root + http-host + virtual-server-docroot
 580  ##
 581 -#simple-vhost.server-root   = "/home/weigon/wwwroot/servers/"
 582 -#simple-vhost.default-host  = "grisu.home.kneschke.de"
 583 -#simple-vhost.document-root = "/pages/"
 584 +#simple-vhost.server-root   = "/srv/www/vhosts/"
 585 +#simple-vhost.default-host  = "www.example.org"
 586 +#simple-vhost.document-root = "/htdocs/"
 587
 588
 589  ##
 590  ## Format: <errorfile-prefix><status-code>.html
 591  ## -> ..../status-404.html for 'File not found'
 592 -#server.errorfile-prefix    = "/home/weigon/projects/lighttpd/doc/status-"
 593 +#server.errorfile-prefix    = "/usr/share/lighttpd/errors/status-"
 594 +#server.errorfile-prefix    = "/srv/www/errors/status-"
 595
 596  ## virtual directory listings
 597  #dir-listing.activate       = "enable"
 598 @@ -189,7 +192,7 @@
 599  #server.groupname           = "wwwrun"
 600
 601  #### compress module
 602 -#compress.cache-dir         = "/tmp/lighttpd/cache/compress/"
 603 +#compress.cache-dir         = "/var/cache/lighttpd/compress/"
 604  #compress.filetype          = ("text/plain", "text/html")
 605
 606  #### proxy module
 607 @@ -209,8 +212,8 @@
 608  #fastcgi.server             = ( ".php" =>
 609  #                               ( "localhost" =>
 610  #                                 (
 611 -#                                   "socket" => "/tmp/php-fastcgi.socket",
 612 -#                                   "bin-path" => "/usr/local/bin/php"
 613 +#                                   "socket" => "/var/run/lighttpd/php-fastcgi.socket",
 614 +#                                   "bin-path" => "/usr/local/bin/php-cgi"
 615  #                                 )
 616  #                               )
 617  #                            )
 618 @@ -222,7 +225,7 @@
 619
 620  #### SSL engine
 621  #ssl.engine                 = "enable"
 622 -#ssl.pemfile                = "server.pem"
 623 +#ssl.pemfile                = "/etc/ssl/private/lighttpd.pem"
 624
 625  #### status module
 626  #status.status-url          = "/server-status"
 627 @@ -269,7 +272,7 @@
 628  # %3 => subdomain 1 name
 629  # %4 => subdomain 2 name
 630  #
 631 -#evhost.path-pattern        = "/home/storage/dev/www/%3/htdocs/"
 632 +#evhost.path-pattern        = "/srv/www/vhosts/%3/htdocs/"
 633
 634  #### expire module
 635  #expire.url                 = ( "/buggy/" => "access 2 hours", "/asdhas/" => "access plus 1 seconds 2 minutes")
 636 @@ -279,14 +282,14 @@
 637
 638  #### rrdtool
 639  #rrdtool.binary             = "/usr/bin/rrdtool"
 640 -#rrdtool.db-name            = "/var/www/lighttpd.rrd"
 641 +#rrdtool.db-name            = "/var/lib/lighttpd/lighttpd.rrd"
 642
 643  #### setenv
 644  #setenv.add-request-header  = ( "TRAV_ENV" => "mysql://user@host/db" )
 645  #setenv.add-response-header = ( "X-Secret-Message" => "42" )
 646
 647  ## for mod_trigger_b4_dl
 648 -# trigger-before-download.gdbm-filename = "/home/weigon/testbase/trigger.db"
 649 +# trigger-before-download.gdbm-filename = "/var/lib/lighttpd/trigger.db"
 650  # trigger-before-download.memcache-hosts = ( "127.0.0.1:11211" )
 651  # trigger-before-download.trigger-url = "^/trigger/"
 652  # trigger-before-download.download-url = "^/download/"
 653 Index: NEWS
 654 ===================================================================
 655 --- NEWS        (.../tags/lighttpd-1.4.16)      (revision 1922)
 656 +++ NEWS        (.../branches/lighttpd-1.4.x)   (revision 1922)
 657 @@ -3,6 +3,13 @@
 658  NEWS
 659  ====
 660
 661 +- 1.4.17 -
 662 +  * added dir-listing.set-footer in mod_dirlisting (#1277)
 663 +  * fixed hardcoded font-sizes in mod_dirlisting (#1267)
 664 +  * fixed different ETag length on 32/64 platforms (#1279)
 665 +  * fixed compression of files < 128 bytes by disabling compression (#1241)
 666 +  * fixed mysql server reconnects (#518)
 667 +
 668  - 1.4.16 -
 669
 670    * added static-file.etags, etag.use-inode, etag.use-mtime, etag.use-size