Browse Source

- white space cleanup part 2 this time 1.4 ;)

i hope it helps with merging stuff back to 1.5

git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@1371 152afb58-edef-0310-8abb-c4023f1b3aa9
tags/lighttpd-1.4.25
Marcus Rückert 13 years ago
parent
commit
8cd1471cb3
100 changed files with 3341 additions and 3341 deletions
  1. +10
    -10
      COPYING
  2. +758
    -758
      ChangeLog
  3. +1
    -1
      INSTALL
  4. +1
    -1
      Makefile.am
  5. +36
    -36
      NEWS
  6. +12
    -12
      README
  7. +27
    -27
      SConstruct
  8. +15
    -15
      configure.in
  9. +114
    -114
      cygwin/lighttpd.README.in
  10. +1
    -1
      debian/Makefile.am
  11. +1
    -1
      debian/control
  12. +10
    -10
      debian/copyright
  13. +1
    -1
      debian/emacsen-install.ex
  14. +1
    -1
      debian/init.d
  15. +17
    -17
      debian/lighttpd.conf
  16. +1
    -1
      debian/lighttpd.doc-base.EX
  17. +1
    -1
      debian/manpage.1.ex
  18. +2
    -2
      debian/manpage.sgml.ex
  19. +2
    -2
      debian/manpage.xml.ex
  20. +5
    -5
      debian/rules
  21. +4
    -4
      distribute.sh.in
  22. +4
    -4
      doc/Makefile.am
  23. +3
    -3
      doc/access.txt
  24. +23
    -23
      doc/accesslog.txt
  25. +4
    -4
      doc/alias.txt
  26. +50
    -50
      doc/authentication.txt
  27. +4
    -4
      doc/cgi.txt
  28. +24
    -24
      doc/cml.txt
  29. +9
    -9
      doc/compress.txt
  30. +78
    -78
      doc/configuration.txt
  31. +4
    -4
      doc/dirlisting.txt
  32. +6
    -6
      doc/evhost.txt
  33. +6
    -6
      doc/expire.txt
  34. +5
    -5
      doc/fastcgi-state.txt
  35. +163
    -163
      doc/fastcgi.txt
  36. +29
    -29
      doc/features.txt
  37. +4
    -4
      doc/performance.txt
  38. +44
    -44
      doc/plugins.txt
  39. +20
    -20
      doc/proxy.txt
  40. +6
    -6
      doc/rc.lighttpd
  41. +4
    -4
      doc/redirect.txt
  42. +10
    -10
      doc/rewrite.txt
  43. +1
    -1
      doc/rrdtool.txt
  44. +3
    -3
      doc/scgi.txt
  45. +6
    -6
      doc/secdownload.txt
  46. +2
    -2
      doc/security.txt
  47. +2
    -2
      doc/setenv.txt
  48. +9
    -9
      doc/simple-vhost.txt
  49. +2
    -2
      doc/skeleton.txt
  50. +1
    -1
      doc/spawn-php.sh
  51. +3
    -3
      doc/ssi.txt
  52. +21
    -21
      doc/state.txt
  53. +6
    -6
      doc/status.txt
  54. +5
    -5
      doc/userdir.txt
  55. +6
    -6
      doc/webdav.txt
  56. +2
    -2
      lighttpd.spec.in
  57. +18
    -18
      openwrt/lighttpd.conf
  58. +5
    -5
      openwrt/lighttpd.mk.in
  59. +19
    -19
      src/Makefile.am
  60. +12
    -12
      src/SConscript
  61. +54
    -54
      src/array.c
  62. +24
    -24
      src/array.h
  63. +112
    -112
      src/base.h
  64. +115
    -115
      src/buffer.c
  65. +5
    -5
      src/buffer.h
  66. +64
    -64
      src/chunk.c
  67. +7
    -7
      src/chunk.h
  68. +65
    -65
      src/configfile-glue.c
  69. +204
    -204
      src/configfile.c
  70. +17
    -17
      src/configparser.y
  71. +4
    -4
      src/connections-glue.c
  72. +307
    -307
      src/connections.c
  73. +8
    -8
      src/data_array.c
  74. +12
    -12
      src/data_config.c
  75. +12
    -12
      src/data_count.c
  76. +10
    -10
      src/data_fastcgi.c
  77. +9
    -9
      src/data_integer.c
  78. +15
    -15
      src/data_string.c
  79. +4
    -4
      src/etag.c
  80. +1
    -1
      src/etag.h
  81. +2
    -2
      src/fastcgi.h
  82. +32
    -32
      src/fdevent.c
  83. +24
    -24
      src/fdevent.h
  84. +7
    -7
      src/fdevent_freebsd_kqueue.c
  85. +40
    -40
      src/fdevent_linux_rtsig.c
  86. +28
    -28
      src/fdevent_linux_sysepoll.c
  87. +26
    -26
      src/fdevent_poll.c
  88. +14
    -14
      src/fdevent_select.c
  89. +25
    -25
      src/fdevent_solaris_devpoll.c
  90. +54
    -54
      src/http-header-glue.c
  91. +229
    -229
      src/http_auth.c
  92. +11
    -11
      src/http_auth.h
  93. +1
    -1
      src/http_auth_digest.h
  94. +29
    -29
      src/http_chunk.c
  95. +9
    -9
      src/inet_ntop_cache.c
  96. +11
    -11
      src/joblist.c
  97. +55
    -55
      src/keyvalue.c
  98. +16
    -16
      src/keyvalue.h
  99. +19
    -19
      src/lemon.c
  100. +17
    -17
      src/lempar.c

+ 10
- 10
COPYING View File

@@ -17,15 +17,15 @@ modification, are permitted provided that the following conditions are met:
be used to endorse or promote products derived from this software without
specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
THE POSSIBILITY OF SUCH DAMAGE.


+ 758
- 758
ChangeLog
File diff suppressed because it is too large
View File


+ 1
- 1
INSTALL View File

@@ -10,7 +10,7 @@ Installation
Installation
------------

Get the source from
Get the source from

http://www.lighttpd.net/download/



+ 1
- 1
Makefile.am View File

@@ -1,3 +1,3 @@
SUBDIRS=src doc tests cygwin openwrt

EXTRA_DIST=lighttpd.spec
EXTRA_DIST=lighttpd.spec

+ 36
- 36
NEWS View File

@@ -32,40 +32,40 @@ NEWS
* fixed required trailing newline in configfiles (#142)
* fixed quoting the autoconf files (#466)
* fixed empty Host: + $HTTP["host"] handling (#458)
* fixed handling of If-Modified-Since if ETag is not set
* fixed handling of If-Modified-Since if ETag is not set
* fixed default-shell if SHELL is not set (#441)
* fixed appending and assigning of env.* vars
* fixed empty FCGI_STDERR packets
* fixed conditional server.allow-http-11
* fixed conditional server.allow-http-11
* fixed handling of follow-symlink + lstat()
* fixed SIGHUP handling if max-workers is used
* fixed "Software caused connection abort" messages on FreeBSD

- 1.4.11 - 2006-03-09

* added ability to specify which ip address spawn-fci listens on
* added ability to specify which ip address spawn-fci listens on
(agkr@pobox.com)
* added mod_flv_streaming to streaming Flash Movies efficiently
* fixed handling of error codes returned by mod_dav_svn behing a
* fixed handling of error codes returned by mod_dav_svn behing a
mod_proxy
* fixed error-messages in mod_auth and mod_fastcgi
* fixed re-enabling overloaded local fastcgi backends
* fixed handling of deleted files in linux-sendfile
* fixed compilation on BSD and MacOSX
* fixed $SERVER["socket"] on a already bound socket
* fixed local source retrieval on windows
* fixed local source retrieval on windows
(secunia)
* fixed hanging cgi if remote side is dieing while reading
* fixed hanging cgi if remote side is dieing while reading
from the pipe (sandy@meebo.com)

- 1.4.10 - 2006-02-08

* added docs for mod_dirlisting
* added fastcgi.map-extensions to mod_fastcgi
* fixed load balancing for mod_fastcgi
* fixed load balancing for mod_fastcgi
* fixed extra newline for syslog() in mod_accesslog
* fixed user-track cookie for IE in mod_usertrack
* fixed crash in digest handling in mod_auth
* fixed crash in digest handling in mod_auth
* fixed handling of 301 response-bodies from a mod_proxy backend
* fixed loading of base modules if server.modules is not set
* fixed broken cgi if mod_scgi is loaded
@@ -97,15 +97,15 @@ NEWS

* added auto-reconnect to ldap-server in mod_auth
(joerg@netbsd.org)
* changed auth.ldap-cafile to be optional
* changed auth.ldap-cafile to be optional
(joerg@netbsd.org)
* added strip_request_uri in mod_fastcgi
* added more X-* headers to mod_proxy
(Ben Grimm <bengrimm@gmail.com>)
* added 'debug' to simple-vhost to suppress the
* added 'debug' to simple-vhost to suppress the
(mod_simple_vhost.c.157) No such file or directory /servers/ww.lighttpd.net/pages/
messages by default
* added support to let the server listen on UNIX-socket
* added support to let the server listen on UNIX-socket
* changed default stat-cache-engine to 'simple'
* removed debian/ dir from source package on request by packager
* fixed max-age timestamps in mod_expire
@@ -113,12 +113,12 @@ NEWS
* fixed range request handling in network_writev
* fixed retry on connect error in mod_fastcgi
(Robert G. Jakabosky <bobby@alphatrade.com>)
* fixed possible crash in mod_webdav if sqlite3 support
* fixed possible crash in mod_webdav if sqlite3 support
is available but not use
* fixed fdvent-handler init if server.max-worker was used
(Siddharth Vijayakrishnan <mail@bluefireworks.net>)
* fixed missing cleanup in mysql_vhost
* fixed assert() in "connections.c:962:
* fixed assert() in "connections.c:962:
connection_handle_read_state: Assertion 'c->mem->used' failed."
* fixed 64bit issue in md5
* fixed crash in mod_status
@@ -137,13 +137,13 @@ NEWS
* added madvise() to instruct the kernel the do proper read-ahead in network_writev
* added support for %I in mod_accesslog
* added better compat to Apache for ?auto in mod_status
* added support for userdirs without a entry in /etc/passwd in mod_userdir
* added support for userdirs without a entry in /etc/passwd in mod_userdir
(rob@inversepath.com)
* added startup-time selectable network-backend
* added location of upload-files to config as array
* added webdav.log-xml for logging xml-content in mod_webdav
* added Cache-Control: max-age to mod_expire
* workaround missing client-bug by assuming we received a close-notify on
* workaround missing client-bug by assuming we received a close-notify on
non-keep-alive requests in SSL request
* disabled kerberos5 support by default to fix compilation on RHEL
* fixed order of library checks to fix compilation on Solaris 9
@@ -194,10 +194,10 @@ NEWS
- 1.4.3 - 2005-09-01

* added gracefull shutdown
* added server.max-connections
* added server.max-connections
* fixed compilation on all BSD platforms
* fixed init of kqueue and /dev/poll after daemonize
* fixed segfault if select() is event-handler and more than FD_SETSIZE
* fixed segfault if select() is event-handler and more than FD_SETSIZE
fds are opened
* fixed compilation of mod_cml
* fixed bin-copy-env in mod_fastcgi
@@ -217,13 +217,13 @@ NEWS
* added a complete Class 1 complient mod_webdav
* fixed ssl support (especially on OpenBSD)
* fixed response header in body problem in mod_cgi
* fixed numbers before body problem
* fixed numbers before body problem
* fixed compilation on Solaris and FreeBSD
* fixed conditional options in mod_dirlisting
* fixed segfault in mod_dirlisting for NFS directories
* fixed check for docroot in change-root environments

- 1.4.0 - 2005-08-17
- 1.4.0 - 2005-08-17

* added nested conditionals
* added remote-ip to $HTTP
@@ -239,7 +239,7 @@ NEWS
* added support for accesslog to syslog
* added support for PATH_INFO guessing if check-local is disabled in
mod_fastcgi
* added switch to disable range-requests
* added switch to disable range-requests
* added valid-user option for mod_auth (tigger at gentoo.org)
* added JavaScript based sorting to mod_status (erik)
* added selective TCP_CORK (Christian von Roques)
@@ -252,7 +252,7 @@ NEWS

- 1.3.15 - 2005-07-15

* added mod_cml
* added mod_cml
* added mod_trigger_b4_dl
* added encoding to mod_dirlisting
* added ?auto to mod_status
@@ -295,7 +295,7 @@ NEWS
* added REMOTE_PORT and SERVER_ADDR to CGI-env
* relaxed handling of newlines before keep-alive requests
* relaxed uri-parser again
* fixed PHP_SELF for php
* fixed PHP_SELF for php
* fixed compilation on MacOS X
* fixed handling of EPIPE and ECONNRESET
* fixed crash in mod_auth if config-options are missing
@@ -309,7 +309,7 @@ NEWS
* added support for full commandline in spawn-fcgi
* fixed missing check for IP-address in mod_fastcgi
* fixed compile error with openssl in mod_fastcgi
* removed a debug-message from network-functions
* removed a debug-message from network-functions

- 1.3.9 - 2005-02-06

@@ -321,9 +321,9 @@ NEWS
* fixed min-procs and max-procs in FastCGI on PowerPC
* fixed crash in setenv.add-response-header
* fixed handling of nph-scripts in CGI
* fixed accidently sending out physical file in CGI on error
* fixed accidently sending out physical file in CGI on error
* fixed cygwin support
* fixed handling of missing files
* fixed handling of missing files
* fixed HEAD requests for dynamic requests

- 1.3.8 - 2005-01-30
@@ -338,22 +338,22 @@ NEWS
* fixed build problems on netbsd 1.4.x and 1.5.x
* fixed status.url configuration
* fixed handling of != and !~ in configutation
* fixed special cases in keep-alive handling
* fixed special cases in keep-alive handling
* fixed timeout handling in handling POST requests
* fixed mode AUTHORIZER in FastCGI
* fixed mode AUTHORIZER in FastCGI
* fixed handling if internal redirects if no Host: is supplied
* fixed mod_alias + pathinfo
* fixed mod_alias + pathinfo
* fixed directory indexes and permissions
* enabled sending errorlog to syslog again

- 1.3.7 - 2004-12-11

* added retries for a fastcgi connect if a php-childs
* added retries for a fastcgi connect if a php-childs
dies at startup
* update the debian directory
* added setgroups() to drop all group-privs
* added native port to windows via mingw32
* added server.tag = '...'
* added server.tag = '...'
* added support for ${...} in mod_ssi
* ported all plugins to conditional support
* fixed multipart handling in cgi
@@ -367,10 +367,10 @@ NEWS
- 1.3.6 - 2004-11-03

* added spawn-fcgi to the distribution
* added support in fastcgi module to spawn fastcgi
* added support in fastcgi module to spawn fastcgi
processes itself
* fixed logfile cycling if external logging is used
* fixed connection handling in fastcgi if no chunk
* fixed connection handling in fastcgi if no chunk
encoding is used
* fixed internal redirects on directories if a query
string is supplied
@@ -379,7 +379,7 @@ NEWS

- 1.3.5 - 2004-10-31

* added mod_alias
* added mod_alias
* added mod_userdir
* added the exec command to the SSI handler
* added a switch to disable follow-symlinks
@@ -395,12 +395,12 @@ NEWS
* added build target for OpenWRT
* added plain backend support for auth-digest
* fixed handling the external accesslog processes
* fixed SERVER_NAME in CGI and FastCGI
* fixed SERVER_NAME in CGI and FastCGI

- 1.3.3 - 2004-10-16

* added support for NL terminators in CGI-scripts
* added support for conditionals in mod_auth,
* added support for conditionals in mod_auth,
mod_simple_vhost and mod_evhost
* added a error-handler for 404 codes
* fixed request counter in the rrdtool module
@@ -504,7 +504,7 @@ NEWS
- 1.2.0 - 2004-05-17

* added conforming Expect: handling
* added a module for secure and fast downloading
* added a module for secure and fast downloading
* rewrote the event handling interface
* fixed array handling which might lead to 'missing header'
* fixed pipelining support


+ 12
- 12
README View File

@@ -12,7 +12,7 @@ a light httpd
:Revision: $Revision: 1.8 $

:abstract:
lighttpd a secure, fast, compliant and very flexible web-server
lighttpd a secure, fast, compliant and very flexible web-server
which has been optimized for high-performance environments. It has a very
low memory footprint compared to other webservers and takes care of cpu-load.
Its advanced feature-set (FastCGI, CGI, Auth, Output-Compression,
@@ -22,7 +22,7 @@ a light httpd
the naming
----------

lighttpd is a __httpd__ which is
lighttpd is a __httpd__ which is

- fast as __light__ning and
- __light__ when it comes to memory consumption and system requirements
@@ -50,7 +50,7 @@ Advanced Features
- load-balanced FastCGI
(one webserver distributes requests to multiple PHP-servers via FastCGI)
- custom error pages (for Response-Code 400-599)
- virtual hosts
- virtual hosts
- directory listings
- streaming CGI and FastCGI
- URL-Rewriting
@@ -71,18 +71,18 @@ PHP-Support
- includes a utility to spawn FastCGI processes (necessary for PHP 4.3.x)

Security features
`````````````````
`````````````````

- chroot(), set UID, set GID
- protecting docroot

HTTP/1.1 features
`````````````````
`````````````````

- Ranges (start-end, start-, -end, multiple ranges)
- HTTP/1.0 Keep-Alive + HTTP/1.1 persistent Connections
- methods: GET, HEAD, POST
- Last-Modified + If-Modified handling
- Last-Modified + If-Modified handling
- sends Content-Length if possible
- sends Transfer-Encoding: chunk, if Content-Length is not possible
- sends Content-Type
@@ -91,7 +91,7 @@ HTTP/1.1 features
(http://www.ietf.org/rfc/rfc2617.txt)

HTTP/1.1 compliance
```````````````````
```````````````````

- Sends 206 for Range Requests
- Sends 304 for If-Modified Requests
@@ -101,7 +101,7 @@ HTTP/1.1 compliance
- Sends 416 for "out-of-range" on Range: Header
- Sends 501 for request-method != (GET|POST|HEAD)
- Sends 505 for protocol != HTTP/1.0 or HTTP/1.1
- Sends Date: on every requests
- Sends Date: on every requests

Intended Audience
-----------------
@@ -118,14 +118,14 @@ It has been tested to work with

- IE 6.0
- Mozilla 1.x
- Konqueror 3.1
- Konqueror 3.1
(for Keep-Alive/Persistent Connections, Accept-Encoding for PHP + gzip)
- wget
- wget
(for Resuming)
- acrobat plugin
(for multiple ranges)
Works on
--------



+ 27
- 27
SConstruct View File

@@ -10,7 +10,7 @@ version = '1.4.13'
def checkCHeaders(autoconf, hdrs):
p = re.compile('[^A-Z0-9]')
for hdr in hdrs:
if not hdr:
if not hdr:
continue
_hdr = Split(hdr)
if autoconf.CheckCHeader(_hdr):
@@ -116,26 +116,26 @@ if 1:
autoconf = Configure(env, custom_tests = {'CheckStructMember': checkStructMember })
autoconf.headerfile = "foo.h"
checkCHeaders(autoconf, string.split("""
arpa/inet.h
fcntl.h
netinet/in.h
sys/types.h netinet/in.h
stdlib.h
arpa/inet.h
fcntl.h
netinet/in.h
sys/types.h netinet/in.h
stdlib.h
string.h
sys/socket.h
sys/types.h sys/socket.h
sys/time.h
unistd.h
sys/sendfile.h
sys/uio.h
sys/types.h sys/uio.h
getopt.h
sys/epoll.h
sys/select.h
sys/types.h sys/select.h
poll.h
sys/time.h
unistd.h
sys/sendfile.h
sys/uio.h
sys/types.h sys/uio.h
getopt.h
sys/epoll.h
sys/select.h
sys/types.h sys/select.h
poll.h
sys/poll.h
sys/devpoll.h
sys/devpoll.h
sys/filio.h
sys/mman.h
sys/types.h sys/mman.h
@@ -147,11 +147,11 @@ if 1:
sys/syslimits.h
sys/resource.h
sys/time.h sys/types.h sys/resource.h
sys/un.h
sys/types.h sys/un.h
syslog.h
stdint.h
inttypes.h
sys/un.h
sys/types.h sys/un.h
syslog.h
stdint.h
inttypes.h
sys/prctl.h
sys/wait.h""", "\n"))

@@ -163,7 +163,7 @@ if 1:

checkTypes(autoconf, Split('pid_t size_t off_t'))

autoconf.env.Append( LIBSQLITE3 = '', LIBXML2 = '', LIBMYSQL = '', LIBZ = '',
autoconf.env.Append( LIBSQLITE3 = '', LIBXML2 = '', LIBMYSQL = '', LIBZ = '',
LIBBZ2 = '', LIBCRYPT = '', LIBMEMCACHE = '', LIBFCGI = '', LIBPCRE = '',
LIBLDAP = '', LIBLBER = '', LIBLUA = '', LIBLUALIB = '', LIBDL = '')

@@ -233,7 +233,7 @@ if 1:
env.Append(LIBLUA = lualibs)
env.Append(CPPFLAGS = [ '-DHAVE_LUA_H' ])
env['LIBS'] = oldlibs

if env['with_pcre']:
pcre_config = checkProgram(env, 'pcre', 'pcre-config')
@@ -243,7 +243,7 @@ if env['with_pcre']:
if env['with_xml']:
xml2_config = checkProgram(env, 'xml', 'xml2-config')
oldlib = env['LIBS']
env['LIBS'] = []
env['LIBS'] = []
env.ParseConfig(xml2_config + ' --cflags --libs')
env.Append(CPPFLAGS = [ '-DHAVE_LIBXML_H', '-DHAVE_LIBXML2' ], LIBXML2 = env['LIBS'])
env['LIBS'] = oldlib
@@ -251,7 +251,7 @@ if env['with_xml']:
if env['with_mysql']:
mysql_config = checkProgram(env, 'mysql', 'mysql_config')
oldlib = env['LIBS']
env['LIBS'] = []
env['LIBS'] = []
env.ParseConfig(mysql_config + ' --cflags --libs')
env.Append(CPPFLAGS = [ '-DHAVE_MYSQL_H', '-DHAVE_LIBMYSQL' ], LIBMYSQL = 'mysqlclient')
env['LIBS'] = oldlib
@@ -265,7 +265,7 @@ else:

versions = string.split(version, '.')
version_id = int(versions[0]) << 16 | int(versions[1]) << 8 | int(versions[2])
env.Append(CPPFLAGS = [
env.Append(CPPFLAGS = [
'-DLIGHTTPD_VERSION_ID=' + str(version_id),
'-DPACKAGE_NAME=\\"' + package + '\\"',
'-DPACKAGE_VERSION=\\"' + version + '\\"',


+ 15
- 15
configure.in View File

@@ -40,13 +40,13 @@ dnl more automake stuff
AM_C_PROTOTYPES

dnl libtool
AC_DISABLE_STATIC
AC_DISABLE_STATIC
AC_ENABLE_SHARED

AC_LIBTOOL_DLOPEN
AC_PROG_LIBTOOL

dnl for solaris
dnl for solaris
CPPFLAGS="${CPPFLAGS} -D_REENTRANT -D__EXTENSIONS__"

# Checks for header files.
@@ -90,7 +90,7 @@ AC_ARG_WITH(mysql,
[WITH_MYSQL=$withval],[WITH_MYSQL=no])

if test "$WITH_MYSQL" != "no"; then
AC_MSG_RESULT(yes)
AC_MSG_RESULT(yes)
if test "$WITH_MYSQL" = "yes"; then
AC_PATH_PROG(MYSQL_CONFIG, mysql_config)
else
@@ -237,8 +237,8 @@ if test "x$use_openssl" = "xyes"; then

AC_CHECK_HEADERS([openssl/ssl.h])
OLDLIBS="$LIBS"
AC_CHECK_LIB(crypto, BIO_f_base64, [
AC_CHECK_LIB(ssl, SSL_new, [ SSL_LIB="-lssl -lcrypto"
AC_CHECK_LIB(crypto, BIO_f_base64, [
AC_CHECK_LIB(ssl, SSL_new, [ SSL_LIB="-lssl -lcrypto"
AC_DEFINE(HAVE_LIBSSL, [], [Have libssl]) ], [], [ -lcrypto "$DL_LIB" ])
], [], [])
LIBS="$OLDLIBS"
@@ -253,7 +253,7 @@ AC_MSG_RESULT([$WITH_PCRE])
if test "x$cross_compiling" = xno -a "$WITH_PCRE" != "no"; then
AC_PATH_PROG(PCRECONFIG, pcre-config)

if test x"$PCRECONFIG" != x; then
if test x"$PCRECONFIG" != x; then
PCRE_LIB=`$PCRECONFIG --libs`
CPPFLAGS="$CPPFLAGS `$PCRECONFIG --cflags`"
OLDLIBS="$LIBS"
@@ -373,7 +373,7 @@ if test "$WITH_MEMCACHE" != "no"; then
])
AC_SUBST(MEMCACHE_LIB)
fi
dnl Check for lua
AC_MSG_CHECKING(if lua-support is requested)
AC_ARG_WITH(lua, AC_HELP_STRING([--with-lua],[lua engine for mod_cml]),
@@ -455,13 +455,13 @@ if test "x$ac_cv_func_sendfile" = xyes; then
int o = 0;
if (-1 == sendfile(-1, 0, &o, 0) && errno == ENOSYS) return -1;
return 0;
} ],
AC_MSG_RESULT(yes),
[ AC_MSG_RESULT(no)
} ],
AC_MSG_RESULT(yes),
[ AC_MSG_RESULT(no)
AC_DEFINE([HAVE_SENDFILE_BROKEN], [1], [broken sendfile]) ] )
else
AC_MSG_RESULT(no, cross-compiling)
AC_DEFINE([HAVE_SENDFILE_BROKEN], [1], [broken sendfile])
AC_MSG_RESULT(no, cross-compiling)
AC_DEFINE([HAVE_SENDFILE_BROKEN], [1], [broken sendfile])
fi
fi

@@ -481,7 +481,7 @@ if test x$ipv6 = xtrue; then
#include <sys/socket.h>
#include <netinet/in.h>], [struct sockaddr_in6 s; struct in6_addr t=in6addr_any; int i=AF_INET6; s; t.s6_addr[0] = 0; ],
[ac_cv_ipv6_support=yes], [ac_cv_ipv6_support=no])])
if test "$ac_cv_ipv6_support" = yes; then
AC_DEFINE(HAVE_IPV6,1,[Whether to enable IPv6 support])
fi
@@ -507,7 +507,7 @@ fi

dnl build version-id
LIGHTTPD_VERSION_ID=`echo $PACKAGE_VERSION | $AWK -F '.' '{print "(" $1 " << 16 | " $2 " << 8 | " $3 ")"}'`
AC_DEFINE_UNQUOTED([LIGHTTPD_VERSION_ID], [$LIGHTTPD_VERSION_ID], [lighttpd-version-id])
AC_DEFINE_UNQUOTED([LIGHTTPD_VERSION_ID], [$LIGHTTPD_VERSION_ID], [lighttpd-version-id])

AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile tests/Makefile \
tests/docroot/Makefile \
@@ -521,7 +521,7 @@ AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile tests/Makefile \
AC_OUTPUT


do_build="mod_cgi mod_fastcgi mod_proxy mod_evhost mod_simple_vhost mod_access mod_alias mod_setenv mod_usertrack mod_auth mod_status mod_accesslog mod_rrdtool mod_secdownload mod_expire mod_compress mod_dirlisting mod_indexfiles mod_userdir mod_webdav mod_staticfile mod_scgi mod_flv_streaming"
do_build="mod_cgi mod_fastcgi mod_proxy mod_evhost mod_simple_vhost mod_access mod_alias mod_setenv mod_usertrack mod_auth mod_status mod_accesslog mod_rrdtool mod_secdownload mod_expire mod_compress mod_dirlisting mod_indexfiles mod_userdir mod_webdav mod_staticfile mod_scgi mod_flv_streaming"

plugins="mod_rewrite mod_redirect mod_ssi mod_trigger_b4_dl"
features="regex-conditionals"


+ 114
- 114
cygwin/lighttpd.README.in View File

@@ -1,114 +1,114 @@
lighttpd
------------------------------------------
A fast, secure and flexible webserver
Runtime requirements:
cygwin-1.5.10 or newer
crypt-1.1 or newer
libbz2_1-1.0.2 or newer
libpcre0-4.5 or newer
openssl-0.9.7d or newer
zlib-1.2.1 or newer
Build requirements:
cygwin-1.5.10 or newer
gcc-3.3.1-3 or newer
binutils-20030901-1 or newer
crypt
openssl-devel
openssl
openldap
openldap-devel
zlib
bzip2
Canonical homepage:
http://jan.kneschke.de/projects/lighttpd/
Canonical download:
http://jan.kneschke.de/projects/lighttpd/download
------------------------------------
Build instructions:
unpack lighttpd-@VERSION@-<REL>-src.tar.bz2
if you use setup to install this src package, it will be
unpacked under /usr/src automatically
cd /usr/src
./lighttpd-@VERSION@-<REL>.sh all
This will create:
/usr/src/lighttpd-@VERSION@-<REL>.tar.bz2
/usr/src/lighttpd-@VERSION@-<REL>-src.tar.bz2
Or use './lighttpd-@VERSION@-<REL>.sh prep' to get a patched source directory
-------------------------------------------
Files included in the binary distribution:
/etc/lighttpd/lighttpd.conf.default
/usr/lib/cyglightcomp.dll
/usr/lib/lighttpd/mod_access.dll
/usr/lib/lighttpd/mod_accesslog.dll
/usr/lib/lighttpd/mod_auth.dll
/usr/lib/lighttpd/mod_cgi.dll
/usr/lib/lighttpd/mod_compress.dll
/usr/lib/lighttpd/mod_evhost.dll
/usr/lib/lighttpd/mod_expire.dll
/usr/lib/lighttpd/mod_fastcgi.dll
/usr/lib/lighttpd/mod_httptls.dll
/usr/lib/lighttpd/mod_maps.dll
/usr/lib/lighttpd/mod_proxy.dll
/usr/lib/lighttpd/mod_redirect.dll
/usr/lib/lighttpd/mod_rewrite.dll
/usr/lib/lighttpd/mod_rrdtool.dll
/usr/lib/lighttpd/mod_secdownload.dll
/usr/lib/lighttpd/mod_simple_vhost.dll
/usr/lib/lighttpd/mod_ssi.dll
/usr/lib/lighttpd/mod_status.dll
/usr/lib/lighttpd/mod_usertrack.dll
/usr/sbin/lighttpd.exe
/usr/share/doc/Cygwin/lighttpd-1.3.0.README
/usr/share/doc/lighttpd-1.3.0/accesslog.txt
/usr/share/doc/lighttpd-1.3.0/authentification.txt
/usr/share/doc/lighttpd-1.3.0/AUTHORS
/usr/share/doc/lighttpd-1.3.0/cgi.txt
/usr/share/doc/lighttpd-1.3.0/ChangeLog
/usr/share/doc/lighttpd-1.3.0/compress.txt
/usr/share/doc/lighttpd-1.3.0/configuration.txt
/usr/share/doc/lighttpd-1.3.0/COPYING
/usr/share/doc/lighttpd-1.3.0/fastcgi-state.txt
/usr/share/doc/lighttpd-1.3.0/fastcgi.txt
/usr/share/doc/lighttpd-1.3.0/features.txt
/usr/share/doc/lighttpd-1.3.0/INSTALL
/usr/share/doc/lighttpd-1.3.0/NEWS
/usr/share/doc/lighttpd-1.3.0/performance.txt
/usr/share/doc/lighttpd-1.3.0/plugins.txt
/usr/share/doc/lighttpd-1.3.0/proxy.txt
/usr/share/doc/lighttpd-1.3.0/README
/usr/share/doc/lighttpd-1.3.0/redirect.txt
/usr/share/doc/lighttpd-1.3.0/rewrite.txt
/usr/share/doc/lighttpd-1.3.0/rrdtool.txt
/usr/share/doc/lighttpd-1.3.0/secdownload.txt
/usr/share/doc/lighttpd-1.3.0/security.txt
/usr/share/doc/lighttpd-1.3.0/simple-vhost.txt
/usr/share/doc/lighttpd-1.3.0/skeleton.txt
/usr/share/doc/lighttpd-1.3.0/ssi.txt
/usr/share/doc/lighttpd-1.3.0/state.txt
/usr/share/man/man1/lighttpd.1.gz
------------------
Port Notes:
---------- lighttpd-1.3.1-1 -----------
Updated to 1.3.1
---------- lighttpd-1.3.0-1 -----------
Initial release
Cygwin port maintained by: Jan Kneschke <jan@kneschke.de>
Please address all questions to the Cygwin mailing list at <cygwin@cygwin.com>
lighttpd
------------------------------------------
A fast, secure and flexible webserver
Runtime requirements:
cygwin-1.5.10 or newer
crypt-1.1 or newer
libbz2_1-1.0.2 or newer
libpcre0-4.5 or newer
openssl-0.9.7d or newer
zlib-1.2.1 or newer
Build requirements:
cygwin-1.5.10 or newer
gcc-3.3.1-3 or newer
binutils-20030901-1 or newer
crypt
openssl-devel
openssl
openldap
openldap-devel
zlib
bzip2
Canonical homepage:
http://jan.kneschke.de/projects/lighttpd/
Canonical download:
http://jan.kneschke.de/projects/lighttpd/download
------------------------------------
Build instructions:
unpack lighttpd-@VERSION@-<REL>-src.tar.bz2
if you use setup to install this src package, it will be
unpacked under /usr/src automatically
cd /usr/src
./lighttpd-@VERSION@-<REL>.sh all
This will create:
/usr/src/lighttpd-@VERSION@-<REL>.tar.bz2
/usr/src/lighttpd-@VERSION@-<REL>-src.tar.bz2
Or use './lighttpd-@VERSION@-<REL>.sh prep' to get a patched source directory
-------------------------------------------
Files included in the binary distribution:
/etc/lighttpd/lighttpd.conf.default
/usr/lib/cyglightcomp.dll
/usr/lib/lighttpd/mod_access.dll
/usr/lib/lighttpd/mod_accesslog.dll
/usr/lib/lighttpd/mod_auth.dll
/usr/lib/lighttpd/mod_cgi.dll
/usr/lib/lighttpd/mod_compress.dll
/usr/lib/lighttpd/mod_evhost.dll
/usr/lib/lighttpd/mod_expire.dll
/usr/lib/lighttpd/mod_fastcgi.dll
/usr/lib/lighttpd/mod_httptls.dll
/usr/lib/lighttpd/mod_maps.dll
/usr/lib/lighttpd/mod_proxy.dll
/usr/lib/lighttpd/mod_redirect.dll
/usr/lib/lighttpd/mod_rewrite.dll
/usr/lib/lighttpd/mod_rrdtool.dll
/usr/lib/lighttpd/mod_secdownload.dll
/usr/lib/lighttpd/mod_simple_vhost.dll
/usr/lib/lighttpd/mod_ssi.dll
/usr/lib/lighttpd/mod_status.dll
/usr/lib/lighttpd/mod_usertrack.dll
/usr/sbin/lighttpd.exe
/usr/share/doc/Cygwin/lighttpd-1.3.0.README
/usr/share/doc/lighttpd-1.3.0/accesslog.txt
/usr/share/doc/lighttpd-1.3.0/authentification.txt
/usr/share/doc/lighttpd-1.3.0/AUTHORS
/usr/share/doc/lighttpd-1.3.0/cgi.txt
/usr/share/doc/lighttpd-1.3.0/ChangeLog
/usr/share/doc/lighttpd-1.3.0/compress.txt
/usr/share/doc/lighttpd-1.3.0/configuration.txt
/usr/share/doc/lighttpd-1.3.0/COPYING
/usr/share/doc/lighttpd-1.3.0/fastcgi-state.txt
/usr/share/doc/lighttpd-1.3.0/fastcgi.txt
/usr/share/doc/lighttpd-1.3.0/features.txt
/usr/share/doc/lighttpd-1.3.0/INSTALL
/usr/share/doc/lighttpd-1.3.0/NEWS
/usr/share/doc/lighttpd-1.3.0/performance.txt
/usr/share/doc/lighttpd-1.3.0/plugins.txt
/usr/share/doc/lighttpd-1.3.0/proxy.txt
/usr/share/doc/lighttpd-1.3.0/README
/usr/share/doc/lighttpd-1.3.0/redirect.txt
/usr/share/doc/lighttpd-1.3.0/rewrite.txt
/usr/share/doc/lighttpd-1.3.0/rrdtool.txt
/usr/share/doc/lighttpd-1.3.0/secdownload.txt
/usr/share/doc/lighttpd-1.3.0/security.txt
/usr/share/doc/lighttpd-1.3.0/simple-vhost.txt
/usr/share/doc/lighttpd-1.3.0/skeleton.txt
/usr/share/doc/lighttpd-1.3.0/ssi.txt
/usr/share/doc/lighttpd-1.3.0/state.txt
/usr/share/man/man1/lighttpd.1.gz
------------------
Port Notes:
---------- lighttpd-1.3.1-1 -----------
Updated to 1.3.1
---------- lighttpd-1.3.0-1 -----------
Initial release
Cygwin port maintained by: Jan Kneschke <jan@kneschke.de>
Please address all questions to the Cygwin mailing list at <cygwin@cygwin.com>

+ 1
- 1
debian/Makefile.am View File

@@ -24,4 +24,4 @@ postrm.ex \
preinst.ex \
prerm.ex \
rules \
watch.ex
watch.ex

+ 1
- 1
debian/control View File

@@ -12,4 +12,4 @@ Provides: httpd, httpd-cgi
Suggests: openssl, rrdtool
Description: A fast webserver with minimal memory footprint
lighttpd is intended to be a frontend for ad-servers which have to deliver
small files concurrently to many connections.
small files concurrently to many connections.

+ 10
- 10
debian/copyright View File

@@ -24,15 +24,15 @@ modification, are permitted provided that the following conditions are met:
be used to endorse or promote products derived from this software without
specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
THE POSSIBILITY OF SUCH DAMAGE.


+ 1
- 1
debian/emacsen-install.ex View File

@@ -23,7 +23,7 @@ FLAGS="${SITEFLAG} -q -batch -l path.el -f batch-byte-compile"
ELDIR=/usr/share/emacs/site-lisp/${PACKAGE}
ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE}

# Install-info-altdir does not actually exist.
# Install-info-altdir does not actually exist.
# Maybe somebody will write it.
if test -x /usr/sbin/install-info-altdir; then
echo install/${PACKAGE}: install Info links for ${FLAVOR}


+ 1
- 1
debian/init.d View File

@@ -4,7 +4,7 @@
# This file should be used to construct scripts for /etc/init.d.
#
# Written by Miquel van Smoorenburg <miquels@cistron.nl>.
# Modified for Debian
# Modified for Debian
# by Ian Murdock <imurdock@gnu.ai.mit.edu>.
#
# Version: @(#)skeleton 1.9 26-Feb-2001 miquels@cistron.nl


+ 17
- 17
debian/lighttpd.conf View File

@@ -1,5 +1,5 @@
# lighttpd configuration file
#
#
# use a it as base for lighttpd 1.0.0 and above
#
# $Id: lighttpd.conf,v 1.7 2004/11/03 22:26:05 weigon Exp $
@@ -11,12 +11,12 @@
# all other module should only be loaded if really neccesary
# - saves some time
# - saves memory
server.modules = (
# "mod_rewrite",
# "mod_redirect",
"mod_access",
# "mod_auth",
# "mod_status",
server.modules = (
# "mod_rewrite",
# "mod_redirect",
"mod_access",
# "mod_auth",
# "mod_status",
# "mod_fastcgi",
# "mod_simple_vhost",
# "mod_evhost",
@@ -27,7 +27,7 @@ server.modules = (
# "mod_rrdtool",
"mod_accesslog" )

## a static document-root, for virtual-hosting take look at the
## a static document-root, for virtual-hosting take look at the
## server.virtual-* options
server.document-root = "/var/www/"

@@ -35,11 +35,11 @@ server.document-root = "/var/www/"
server.errorlog = "/var/log/lighttpd/error.log"

# files to check for if .../ is requested
server.indexfiles = ( "index.php", "index.html",
server.indexfiles = ( "index.php", "index.html",
"index.htm", "default.htm" )

# mimetype mapping
mimetype.assign = (
mimetype.assign = (
".pdf" => "application/pdf",
".sig" => "application/pgp-signature",
".spl" => "application/futuresplash",
@@ -133,7 +133,7 @@ server.pid-file = "/var/run/lighttpd.pid"
#simple-vhost.document-root = "/pages/"


##
##
## Format: <errorfile-prefix><status>.html
## -> ..../status-404.html for 'File not found'
#server.errorfile-prefix = "/home/weigon/projects/lighttpd/doc/status-"
@@ -162,8 +162,8 @@ server.groupname = "www-data"
#### fastcgi module
## read fastcgi.txt for more info
#fastcgi.server = ( ".php" =>
# ( "localhost" =>
# (
# ( "localhost" =>
# (
# "socket" => "/tmp/php-fastcgi.socket",
# "bin-path" => "/usr/local/bin/php"
# )
@@ -192,14 +192,14 @@ server.groupname = "www-data"
# auth.backend.ldap.base-dn = "dc=my-domain,dc=com"
# auth.backend.ldap.filter = "(uid=$)"

# auth.require = ( "/server-status" =>
# (
# auth.require = ( "/server-status" =>
# (
# "method" => "digest",
# "realm" => "download archiv",
# "require" => "group=www|user=jan|host=192.168.2.10"
# ),
# "/server-info" =>
# (
# "/server-info" =>
# (
# "method" => "digest",
# "realm" => "download archiv",
# "require" => "group=www|user=jan|host=192.168.2.10"


+ 1
- 1
debian/lighttpd.doc-base.EX View File

@@ -19,4 +19,4 @@ Format: HTML
Index: /usr/share/doc/lighttpd/html/index.html
Files: /usr/share/doc/lighttpd/html/*.html


+ 1
- 1
debian/manpage.1.ex View File

@@ -34,7 +34,7 @@ because the original program does not have a manual page.
Instead, it has documentation in the GNU Info format; see below.
.PP
.\" TeX users may be more comfortable with the \fB<whatever>\fP and
.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
.\" respectively.
\fBlighttpd\fP is a program that...
.SH OPTIONS


+ 2
- 2
debian/manpage.sgml.ex View File

@@ -8,7 +8,7 @@
manpage.1: manpage.sgml
docbook-to-man $< > $@

The docbook-to-man binary is found in the docbook-to-man package.
Please remember that if you create the nroff version in one of the
debian/rules file targets (such as build), you will need to include
@@ -125,7 +125,7 @@ manpage.1: manpage.sgml
<para>This manual page was written by &dhusername; &dhemail; for
the &debian; system (but may be used by others). Permission is
granted to copy, distribute and/or modify this document under
the terms of the &gnu; General Public License, Version 2 any
the terms of the &gnu; General Public License, Version 2 any
later version published by the Free Software Foundation.
</para>
<para>


+ 2
- 2
debian/manpage.xml.ex View File

@@ -17,7 +17,7 @@ XP=xsltproc -''-nonet

manpage.1: manpage.dbk
$(XP) $(DB2MAN) $<
The xsltproc binary is found in the xsltproc package. The
XSL files are in docbook-xsl. Please remember that if you
create the nroff version in one of the debian/rules file
@@ -135,7 +135,7 @@ and docbook-xsl in your Build-Depends control field.
<para>This manual page was written by &dhusername; &dhemail; for
the &debian; system (but may be used by others). Permission is
granted to copy, distribute and/or modify this document under
the terms of the &gnu; General Public License, Version 2 any
the terms of the &gnu; General Public License, Version 2 any
later version published by the Free Software Foundation.
</para>
<para>


+ 5
- 5
debian/rules View File

@@ -52,7 +52,7 @@ build-stamp: config.status
clean:
dh_testdir
dh_testroot
rm -f build-stamp
rm -f build-stamp

# Add here commands to clean up after the build process.
-$(MAKE) distclean
@@ -64,12 +64,12 @@ ifneq "$(wildcard /usr/share/misc/config.guess)" ""
endif


dh_clean
dh_clean

install: build
dh_testdir
dh_testroot
dh_clean -k
dh_clean -k
dh_installdirs

# Add here commands to install the package into debian/lighttpd.
@@ -91,7 +91,7 @@ binary-arch: build install
dh_installexamples
# dh_install
# dh_installmenu
# dh_installdebconf
# dh_installdebconf
dh_installlogrotate
# dh_installemacsen
# dh_installpam
@@ -114,4 +114,4 @@ binary-arch: build install
dh_builddeb

binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install
.PHONY: build clean binary-indep binary-arch binary install

+ 4
- 4
distribute.sh.in View File

@@ -3,7 +3,7 @@ PACKAGE=@PACKAGE_TARNAME@
VERSION=@VERSION@
NAME=@PACKAGE_TARNAME@-@VERSION@

DISTDIR="/home/jan/wwwroot/servers/www.lighttpd.net/pages/download/"
DISTDIR="/home/jan/wwwroot/servers/www.lighttpd.net/pages/download/"
RPMS="/home/jan/rpmbuild/RPMS/i386/${NAME}-1.i386.rpm \
/home/jan/rpmbuild/SRPMS/${NAME}-1.src.rpm"
FILES="${RPMS} ${NAME}.tar.gz \
@@ -21,7 +21,7 @@ esac
echo ${nopack}

if test x${pack} = x1; then
make distcheck && rpmbuild -ta --nodeps ${NAME}.tar.gz
make distcheck && rpmbuild -ta --nodeps ${NAME}.tar.gz
gpg --detach-sign ${NAME}.tar.gz
rpm --addsign ${RPMS}
fi
@@ -49,7 +49,7 @@ Download
MD5: ${MD5SRPM}
- ${NAME}.tar.gz
${DLNAME}.tar.gz
MD5: ${MD5TGZ}
MD5: ${MD5TGZ}
Signature: ${DLNAME}.tar.gz.sig

EOF
@@ -67,7 +67,7 @@ Checksums
- ${NAME}-1.src.rpm
MD5: ${MD5SRPM}
- ${NAME}.tar.gz
MD5: ${MD5TGZ}
MD5: ${MD5TGZ}

EOF



+ 4
- 4
doc/Makefile.am View File

@@ -81,7 +81,7 @@ EXTRA_DIST=lighttpd.conf lighttpd.user \
newstyle.css \
oldstyle.css \
$(DOCS)
%.html: %.txt
rst2html $^ > $@

@@ -90,11 +90,11 @@ html: $(HTMLDOCS)

#%.ps.gz: %.ps
# gzip $^
#%.ps: %.dot
# dot -Tps -o $@ $^
# dot -Tps -o $@ $^

clean-local:
rm -f *.html


+ 3
- 3
doc/access.txt View File

@@ -12,10 +12,10 @@ Module: mod_access

:abstract:
The access module is used to deny access to files with given trailing path names.
.. meta::
:keywords: lighttpd, trailing path access control
.. contents:: Table of Contents

Description
@@ -32,7 +32,7 @@ url.access-deny
Default: empty

Example: ::
url.access-deny = ( "~", ".inc")

will deny access to all files ended with a diacritical mark (~) or .inc


+ 23
- 23
doc/accesslog.txt View File

@@ -11,11 +11,11 @@ Module: mod_accesslog
:Revision: $Revision: 1.2 $

:abstract:
The accesslog module ...
The accesslog module ...
.. meta::
:keywords: lighttpd, accesslog, CLF
.. contents:: Table of Contents

Description
@@ -28,30 +28,30 @@ Options

accesslog.use-syslog
send the accesslog to syslog
Default: disabled

accesslog.filename
name of the file where the accesslog should be written too if syslog
is not used.
if the name starts with a '|' the rest of the name is taken
as the name of a process which will be spawn and will get the
output
e.g.: ::
accesslog.filename = "/var/log/lighttpd.log"
$HTTP["host"] == "mail.example.org" {
accesslog.filename = "|/usr/bin/cronolog"
}
Default: disabled

accesslog.format
the format of the logfile
====== ================================
Option Description
====== ================================
@@ -60,8 +60,8 @@ accesslog.format
%l ident name (not supported)
%u authenticated user
%t timestamp for the request-start
%r request-line
%s status code
%r request-line
%s status code
%b bytes sent for the body
%i HTTP-header field
%a remote address
@@ -86,16 +86,16 @@ accesslog.format
%I bytes incomming
%O bytes outgoing
====== ================================
If %s is written %>s or %<s the < and the > are ignored. They are support
for compat with apache.
for compat with apache.
%i and %o expect the name of the field which should be written in curly brackets.
e.g.: ::
accesslog.format = "%h %l %u %t \"%r\" %b %>s \"%{User-Agent}i\" \"%{Referer}i\""
Default: CLF compatible output

Response Header
@@ -109,18 +109,18 @@ If you want to log it into the accesslog just specify the field-name within
a %{...}o like ::

accesslog.format = "%h %l %u %t \"%r\" %b %>s \"%{User-Agent}i\" \"%{Referer}i\" \"%{X-LIGHTTPD-SID}o\""
The prefix ``X-LIGHTTPD-`` is special as every response header starting with
this prefix is assumed to be special for lighttpd and won't be sent out
to the client.
to the client.

An example the use this functionality is provided below: ::

<?php
session_start();
header("X-LIGHTTPD-SID: ".session_id());
?>


+ 4
- 4
doc/alias.txt View File

@@ -11,11 +11,11 @@ Module: mod_alias
:Revision: $Revision: 1.1 $

:abstract:
The alias module ...
The alias module ...
.. meta::
:keywords: lighttpd, alias
.. contents:: Table of Contents

Description
@@ -32,5 +32,5 @@ alias.url
Default: empty

Example: ::
alias.url = ( "/cgi-bin/" => "/var/www/servers/www.example.org/cgi-bin/" )

+ 50
- 50
doc/authentication.txt View File

@@ -12,10 +12,10 @@ Module: mod_auth

:abstract:
The auth module provides ...
.. meta::
:keywords: lighttpd, authentication
.. contents:: Table of Contents

Description
@@ -24,85 +24,85 @@ Description
Supported Methods
-----------------

lighttpd supportes both authentication method described by
RFC 2617:
lighttpd supportes both authentication method described by
RFC 2617:

basic
`````

The Basic method transfers the username and the password in
cleartext over the network (base64 encoded) and might result
in security problems if not used in conjunction with a crypted
The Basic method transfers the username and the password in
cleartext over the network (base64 encoded) and might result
in security problems if not used in conjunction with a crypted
channel between client and server.

digest
``````

The Digest method only transfers a hashed value over the
network which performs a lot of work to harden the
The Digest method only transfers a hashed value over the
network which performs a lot of work to harden the
authentication process in insecure networks.

Backends
--------

Depending on the method lighttpd provides various way to store
Depending on the method lighttpd provides various way to store
the credentials used for the authentication.

for basic auth:

- plain_
- htpasswd_
- htpasswd_
- htdigest_
- ldap_
for digest auth:

- plain_
- htdigest_

plain
`````

A file which contains username and the cleartext password
seperated by a colon. Each entry is terminated by a single
A file which contains username and the cleartext password
seperated by a colon. Each entry is terminated by a single
newline.::

e.g.:
agent007:secret

htpasswd
````````

A file which contains username and the crypt()'ed password
seperated by a colon. Each entry is terminated by a single
A file which contains username and the crypt()'ed password
seperated by a colon. Each entry is terminated by a single
newline. ::

e.g.:
agent007:XWY5JwrAVBXsQ

You can use htpasswd from the apache distribution to manage
You can use htpasswd from the apache distribution to manage
those files. ::
$ htpasswd lighttpd.user.htpasswd agent007
htdigest
````````

A file which contains username, realm and the md5()'ed
password seperated by a colon. Each entry is terminated
A file which contains username, realm and the md5()'ed
password seperated by a colon. Each entry is terminated
by a single newline. ::
e.g.:
agent007:download area:8364d0044ef57b3defcfa141e8f77b65
You can use htdigest from the apache distribution to manage
You can use htdigest from the apache distribution to manage
those files. ::

$ htdigest lighttpd.user.htdigest 'download area' agent007
Using md5sum can also generate the password-hash: ::

#!/bin/sh
@@ -118,21 +118,21 @@ To use it:

$ htdigest.sh 'agent007' 'download area' 'secret'
agent007:download area:8364d0044ef57b3defcfa141e8f77b65
ldap
````

the ldap backend is basically performing the following steps
the ldap backend is basically performing the following steps
to authenticate a user
1. connect anonymously (at plugin init)
2. get DN for filter = username
3. auth against ldap server
4. disconnect
if all 4 steps are performed without any error the user is
if all 4 steps are performed without any error the user is
authenticated

Configuration
@@ -143,28 +143,28 @@ Configuration
## debugging
# 0 for off, 1 for 'auth-ok' messages, 2 for verbose debugging
auth.debug = 0
## type of backend
## type of backend
# plain, htpasswd, ldap or htdigest
auth.backend = "htpasswd"

# filename of the password storage for
# filename of the password storage for
# plain
auth.backend.plain.userfile = "lighttpd-plain.user"
## for htpasswd
auth.backend.htpasswd.userfile = "lighttpd-htpasswd.user"
## for htdigest
auth.backend.htdigest.userfile = "lighttpd-htdigest.user"

## for ldap
# the $ in auth.backend.ldap.filter is replaced by the
# the $ in auth.backend.ldap.filter is replaced by the
# 'username' from the login dialog
auth.backend.ldap.hostname = "localhost"
auth.backend.ldap.base-dn = "dc=my-domain,dc=com"
auth.backend.ldap.filter = "(uid=$)"
# if enabled, startTLS needs a valid (base64-encoded) CA
# if enabled, startTLS needs a valid (base64-encoded) CA
# certificate
auth.backend.ldap.starttls = "enable"
auth.backend.ldap.ca-file = "/etc/CAcertificate.pem"
@@ -178,20 +178,20 @@ Configuration
# "require" => "user=<username>" )
# )
#
# <realm> is a string to display in the dialog
# presented to the user and is also used for the
# digest-algorithm and has to match the realm in the
# <realm> is a string to display in the dialog
# presented to the user and is also used for the
# digest-algorithm and has to match the realm in the
# htdigest file (if used)
#

auth.require = ( "/download/" =>
(
auth.require = ( "/download/" =>
(
"method" => "digest",
"realm" => "download archiv",
"require" => "user=agent007|user=agent008"
),
"/server-info" =>
(
"/server-info" =>
(
"method" => "digest",
"realm" => "download archiv",
"require" => "valid-user"
@@ -201,7 +201,7 @@ Configuration
Limitations
============

- The implementation of digest method is currently not
- The implementation of digest method is currently not
completely compliant with the standard as it still allows
a replay attack.


+ 4
- 4
doc/cgi.txt View File

@@ -12,10 +12,10 @@ Module: mod_cgi

:abstract:
The cgi module provides a CGI-conforming interface.
.. meta::
:keywords: lighttpd, cgi
.. contents:: Table of Contents

Description
@@ -32,7 +32,7 @@ cgi.assign
file-extensions that are handled by a CGI program

e.g.: ::
cgi.assign = ( ".pl" => "/usr/bin/perl",
".cgi" => "/usr/bin/perl" )

@@ -43,7 +43,7 @@ To setup a executable which doesn't need the help of a external program you
just don't specify a handler for the extension. ::

cgi.assign = ( ".sh" => "" )
If the file has no extension keep in mind that lighttpd matches not the
extension itself but the right part of the URL: ::



+ 24
- 24
doc/cml.txt View File

@@ -12,10 +12,10 @@ Module: mod_cml

:abstract:
CML is a Meta language to describe the dependencies of a page at one side and building a page from its fragments on the other side using LUA.
.. meta::
:keywords: lighttpd, cml, lua
.. contents:: Table of Contents

Description
@@ -31,7 +31,7 @@ CML (Cache Meta Language) wants to solves several problems:
Cache Decision
--------------

A simple example should show how to a content caching the very simple way in PHP.
A simple example should show how to a content caching the very simple way in PHP.

jan.kneschke.de has a very simple design:

@@ -39,7 +39,7 @@ jan.kneschke.de has a very simple design:
* the menu is generated from a menu.csv file
* the content is coming from files on the local directory named content-1, content-2 and so on

The page content is static as long non of the those tree items changes. A change in the layout
The page content is static as long non of the those tree items changes. A change in the layout
is affecting all pages, a change of menu.csv too, a change of content-x file only affects the
cached page itself.

@@ -58,7 +58,7 @@ If we model this in PHP we get: ::
}

foreach($content as $k => $v) {
if (isset($v["file"]) &&
if (isset($v["file"]) &&
filemtime($v["file"]) > $cachemtime) {
return 0;
}
@@ -71,7 +71,7 @@ If we model this in PHP we get: ::
return 0;
}
}
if (is_cachable(...), $cachefile) {
readfile($cachefile);
exit();
@@ -81,7 +81,7 @@ If we model this in PHP we get: ::
?>

Quite simple. No magic involved. If the one of the files is new than the cached
content, the content is dirty and has to be regenerated.
content, the content is dirty and has to be regenerated.

Now let take a look at the numbers:

@@ -92,9 +92,9 @@ As you can see the increase is not as good as it could be. The main reason as th
of the PHP interpreter to start up (a byte-code cache has been used here).

Moving these decisions out of the PHP script into a server module will remove the need
to start PHP for a cache-hit.
to start PHP for a cache-hit.

To transform this example into a CML you need 'index.cml' in the list of indexfiles
To transform this example into a CML you need 'index.cml' in the list of indexfiles
and the following index.cml file: ::

output_contenttype = "text/html"
@@ -110,7 +110,7 @@ and the following index.cml file: ::
file_mtime(b .. "templates/jk.tmpl") > file_mtime(cwd .. "_cache.html") or
file_mtime(b .. "content.html") > file_mtime(cwd .. "_cache.html") then
return CACHE_MISS
else
else
return CACHE_HIT
end

@@ -132,26 +132,26 @@ Sometimes the different fragment are already generated externally. You have to c
readfile("spacer2.html");
readfile("news.html");
readfile("footer.html");
?>
?>

We we can do the same several times faster directly in the webserver.
We we can do the same several times faster directly in the webserver.

Don't forget: Webserver are built to send out static content, that is what they can do best.

The index.cml for this looks like: ::

output_contenttype = "text/html"
cwd = request["CWD"]
output_include = { cwd .. "head.html",
output_include = { cwd .. "head.html",
cwd .. "menu.html",
cwd .. "spacer.html",
cwd .. "db-content.html",
cwd .. "spacer2.html",
cwd .. "news.html",
cwd .. "footer.html" }
return CACHE_HIT

Now we get about 10000 req/s instead of 600 req/s.
@@ -161,7 +161,7 @@ Power Magnet

Next to all the features about Cache Decisions CML can do more. Starting
with lighttpd 1.4.9 a power-magnet was added which attracts each request
and allows you to manipulate the request for your needs.
and allows you to manipulate the request for your needs.

We want to display a maintainance page by putting a file in a specified
place:
@@ -183,7 +183,7 @@ and create /home/www/power-magnet.cml with: ::

For each requested file the /home/www/power-magnet.cml is executed which
checks if maintainance.html exists in the docroot and displays it
instead of handling the usual request.
instead of handling the usual request.

Another example, create thumbnail for requested image and serve it instead
of sending the big image: ::
@@ -196,7 +196,7 @@ of sending the big image: ::
dr = request["DOCUMENT_ROOT"]
sn = request["SCRIPT_NAME"]

## to be continued :) ...
## to be continued :) ...

trigger_handler = '/gen_image.php'

@@ -217,7 +217,7 @@ To use the plugin you have to load it: ::
Options
=======

:cml.extension:
:cml.extension:
the file extension that is bound to the cml-module
:cml.memcache-hosts:
hosts for the memcache.* functions
@@ -229,7 +229,7 @@ Options
Language
========

The language used for CML is provided by `LUA <http://www.lua.org/>`_.
The language used for CML is provided by `LUA <http://www.lua.org/>`_.

Additionally to the functions provided by lua mod_cml provides: ::

@@ -252,10 +252,10 @@ Additionally to the functions provided by lua mod_cml provides: ::
number file_mtime(string)
string memcache_get_string(string)
number memcache_get_long(string)
boolean memcache_exists(string)
boolean memcache_exists(string)


What ever your script does, it has to return either CACHE_HIT or CACHE_MISS.
It case a error occures check the error-log, the user will get a error 500. If you don't like
What ever your script does, it has to return either CACHE_HIT or CACHE_MISS.
It case a error occures check the error-log, the user will get a error 500. If you don't like
the standard error-page use ``server.errorfile-prefix``.


+ 9
- 9
doc/compress.txt View File

@@ -12,17 +12,17 @@ Module: mod_compress

:abstract:
a nice, short abstrace about the module
.. meta::
:keywords: lighttpd, compress
.. contents:: Table of Contents

Description
===========

Output compression reduces the network load and can improve the overall
throughput of the webserver.
throughput of the webserver.

Only static content is supported up to now.

@@ -36,21 +36,21 @@ compress.cache-dir
name of the directory where compressed content will be cached

e.g.: ::
compress.cache-dir = "/var/www/cache/"
# even better with virt-hosting
$HTTP["host"] == "docs.example.org" {
compress.cache-dir = "/var/www/cache/docs.example.org/"
}
Default: not set, compress the file for every request

compress.filetype
mimetypes where might get compressed
e.g.: ::
compress.filetype = ("text/plain", "text/html")

Default: not set
@@ -62,5 +62,5 @@ Compressing Dynamic Content
To compress dynamic content with PHP please enable ::

zlib.output_compression = 1
in the php.ini as PHP provides compression support by itself.

+ 78
- 78
doc/configuration.txt View File

@@ -12,10 +12,10 @@ Module: core

:abstract:
the layout of the configuration file
.. meta::
:keywords: lighttpd, configuration
.. contents:: Table of Contents

Description
@@ -36,21 +36,21 @@ A BNF like notation: ::
<array> : "(" [ <string> "=>" ] <value> [, [ <string> "=>" ] <value> ]* ")"
INCLUDE : "include" VALUE
INCLUDE_SHELL : "include_shell" STRING_VALUE
Example
-------

::
# default document-root
server.document-root = "/var/www/example.org/pages/"
# TCP port
server.port = 80
# selecting modules
server.modules = ( "mod_access", "mod_rewrite" )
# variables, computed when config is read.
var.mymodule = "foo"