SOURCES: lighttpd-branch.diff - svn 1277
glen
glen at pld-linux.org
Thu Sep 7 00:10:13 CEST 2006
Author: glen Date: Wed Sep 6 22:10:13 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- svn 1277
---- Files affected:
SOURCES:
lighttpd-branch.diff (1.10 -> 1.11)
---- Diffs:
================================================================
Index: SOURCES/lighttpd-branch.diff
diff -u SOURCES/lighttpd-branch.diff:1.10 SOURCES/lighttpd-branch.diff:1.11
--- SOURCES/lighttpd-branch.diff:1.10 Thu Jul 20 00:16:12 2006
+++ SOURCES/lighttpd-branch.diff Thu Sep 7 00:10:08 2006
@@ -1,5 +1,5 @@
--- ../lighttpd-1.4.11/NEWS 2006-03-09 19:34:33.000000000 +0200
-+++ lighttpd-1.4.12/NEWS 2006-07-16 00:26:05.000000000 +0300
++++ lighttpd-1.5.0/NEWS 2006-07-16 00:26:05.000000000 +0300
@@ -3,6 +3,23 @@
NEWS
====
@@ -25,13 +25,13 @@
* added ability to specify which ip address spawn-fci listens on
--- ../lighttpd-1.4.11/configure.in 2006-03-04 16:32:38.000000000 +0200
-+++ lighttpd-1.4.12/configure.in 2006-07-19 20:02:55.000000000 +0300
++++ lighttpd-1.5.0/configure.in 2006-09-07 00:57:05.000000000 +0300
@@ -1,7 +1,7 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.57)
-AC_INIT(lighttpd, 1.4.11, jan at kneschke.de)
-+AC_INIT(lighttpd, 1.4.12, jan at kneschke.de)
++AC_INIT(lighttpd, 1.5.0, jan at kneschke.de)
AC_CONFIG_SRCDIR([src/server.c])
AC_CANONICAL_TARGET
@@ -146,7 +146,7 @@
$ECHO
--- ../lighttpd-1.4.11/cygwin/lighttpd.README 2006-03-07 14:22:19.000000000 +0200
-+++ lighttpd-1.4.12/cygwin/lighttpd.README 2006-07-19 20:09:00.000000000 +0300
++++ lighttpd-1.5.0/cygwin/lighttpd.README 2006-09-07 01:00:40.000000000 +0300
@@ -1,114 +1,114 @@
-lighttpd
-------------------------------------------
@@ -295,17 +295,17 @@
+------------------------------------
+
+Build instructions:
-+ unpack lighttpd-1.4.12-<REL>-src.tar.bz2
++ unpack lighttpd-1.5.0-<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-1.4.12-<REL>.sh all
++ ./lighttpd-1.5.0-<REL>.sh all
+
+This will create:
-+ /usr/src/lighttpd-1.4.12-<REL>.tar.bz2
-+ /usr/src/lighttpd-1.4.12-<REL>-src.tar.bz2
++ /usr/src/lighttpd-1.5.0-<REL>.tar.bz2
++ /usr/src/lighttpd-1.5.0-<REL>-src.tar.bz2
+
-+Or use './lighttpd-1.4.12-<REL>.sh prep' to get a patched source directory
++Or use './lighttpd-1.5.0-<REL>.sh prep' to get a patched source directory
+
+-------------------------------------------
+
@@ -377,7 +377,7 @@
+Please address all questions to the Cygwin mailing list at <cygwin at cygwin.com>
+
--- ../lighttpd-1.4.11/cygwin/lighttpd.README.in 2005-08-11 01:26:59.000000000 +0300
-+++ lighttpd-1.4.12/cygwin/lighttpd.README.in 2006-07-16 00:26:04.000000000 +0300
++++ lighttpd-1.5.0/cygwin/lighttpd.README.in 2006-07-16 00:26:04.000000000 +0300
@@ -1,114 +1,114 @@
-lighttpd
-------------------------------------------
@@ -608,7 +608,7 @@
+Please address all questions to the Cygwin mailing list at <cygwin at cygwin.com>
+
--- ../lighttpd-1.4.11/doc/authentication.txt 2006-01-12 20:34:26.000000000 +0200
-+++ lighttpd-1.4.12/doc/authentication.txt 2006-07-16 00:26:05.000000000 +0300
++++ lighttpd-1.5.0/doc/authentication.txt 2006-07-16 00:26:05.000000000 +0300
@@ -7,8 +7,8 @@
----------------
@@ -621,7 +621,7 @@
:abstract:
The auth module provides ...
--- ../lighttpd-1.4.11/doc/compress.txt 2005-08-11 01:26:16.000000000 +0300
-+++ lighttpd-1.4.12/doc/compress.txt 2006-07-16 00:26:05.000000000 +0300
++++ lighttpd-1.5.0/doc/compress.txt 2006-07-16 00:26:05.000000000 +0300
@@ -22,12 +22,38 @@
===========
@@ -696,7 +696,7 @@
===========================
--- ../lighttpd-1.4.11/doc/configuration.txt 2006-03-09 02:10:40.000000000 +0200
-+++ lighttpd-1.4.12/doc/configuration.txt 2006-07-16 00:26:05.000000000 +0300
++++ lighttpd-1.5.0/doc/configuration.txt 2006-07-16 00:26:05.000000000 +0300
@@ -7,8 +7,8 @@
------------
@@ -720,7 +720,7 @@
+ for developers only
+ default: disabled
--- ../lighttpd-1.4.11/doc/fastcgi.txt 2006-02-16 17:03:52.000000000 +0200
-+++ lighttpd-1.4.12/doc/fastcgi.txt 2006-07-16 00:26:05.000000000 +0300
++++ lighttpd-1.5.0/doc/fastcgi.txt 2006-07-16 00:26:05.000000000 +0300
@@ -144,8 +144,8 @@
PHP can extract PATH_INFO from it (default: disabled)
:"disable-time": time to wait before a disabled backend is checked
@@ -733,7 +733,7 @@
If bin-path is set:
--- ../lighttpd-1.4.11/doc/lighttpd.conf 2006-03-04 14:41:12.000000000 +0200
-+++ lighttpd-1.4.12/doc/lighttpd.conf 2006-07-16 00:26:05.000000000 +0300
++++ lighttpd-1.5.0/doc/lighttpd.conf 2006-07-16 00:26:05.000000000 +0300
@@ -172,10 +172,11 @@
#dir-listing.activate = "enable"
@@ -751,7 +751,7 @@
### only root can use these options
#
--- ../lighttpd-1.4.11/doc/performance.txt 2006-02-02 13:01:08.000000000 +0200
-+++ lighttpd-1.4.12/doc/performance.txt 2006-07-16 00:26:05.000000000 +0300
++++ lighttpd-1.5.0/doc/performance.txt 2006-07-16 00:26:05.000000000 +0300
@@ -183,6 +183,8 @@
server.stat-cache-engine = "fam" # either fam, simple or disabled
@@ -762,7 +762,7 @@
Platform-Specific Notes
=======================
--- ../lighttpd-1.4.11/doc/secdownload.txt 2005-12-20 15:58:58.000000000 +0200
-+++ lighttpd-1.4.12/doc/secdownload.txt 2006-07-16 00:26:05.000000000 +0300
++++ lighttpd-1.5.0/doc/secdownload.txt 2006-07-16 00:26:05.000000000 +0300
@@ -118,7 +118,7 @@
$secret = "verysecret";
$uri_prefix = "/dl/";
@@ -773,69 +773,84 @@
# current timestamp
--- ../lighttpd-1.4.11/lighttpd.spec 2006-03-07 14:22:18.000000000 +0200
-+++ lighttpd-1.4.12/lighttpd.spec 2006-07-19 20:09:00.000000000 +0300
++++ lighttpd-1.5.0/lighttpd.spec 2006-09-07 01:00:40.000000000 +0300
@@ -1,6 +1,6 @@
Summary: A fast webserver with minimal memory-footprint (lighttpd)
Name: lighttpd
-Version: 1.4.11
-+Version: 1.4.12
++Version: 1.5.0
Release: 1
Source: http://jan.kneschke.de/projects/lighttpd/download/lighttpd-%version.tar.gz
Packager: Jan Kneschke <jan at kneschke.de>
--- ../lighttpd-1.4.11/openwrt/control 2006-03-07 14:22:19.000000000 +0200
-+++ lighttpd-1.4.12/openwrt/control 2006-07-19 20:09:00.000000000 +0300
++++ lighttpd-1.5.0/openwrt/control 2006-09-07 01:00:41.000000000 +0300
@@ -1,8 +1,8 @@
Package: lighttpd
-Version: 1.4.11
-+Version: 1.4.12
++Version: 1.5.0
Architecture: mipsel
Maintainer: Jan Kneschke <jan at kneschke.de>
-Source: http://jan.kneschke.de/projects/lighttpd/download/lighttpd-1.4.11.tar.gz
-+Source: http://jan.kneschke.de/projects/lighttpd/download/lighttpd-1.4.12.tar.gz
++Source: http://jan.kneschke.de/projects/lighttpd/download/lighttpd-1.5.0.tar.gz
Section: net
Priority: optional
Depends:
--- ../lighttpd-1.4.11/openwrt/lighttpd.mk 2006-03-07 14:22:19.000000000 +0200
-+++ lighttpd-1.4.12/openwrt/lighttpd.mk 2006-07-19 20:09:00.000000000 +0300
++++ lighttpd-1.5.0/openwrt/lighttpd.mk 2006-09-07 01:00:41.000000000 +0300
@@ -10,7 +10,7 @@
# For this example we'll use a fairly simple package that compiles easily
# and has sources available for download at sourceforge
-LIGHTTPD=lighttpd-1.4.11
-+LIGHTTPD=lighttpd-1.4.12
++LIGHTTPD=lighttpd-1.5.0
LIGHTTPD_TARGET=.built
LIGHTTPD_DIR=$(BUILD_DIR)/$(LIGHTTPD)
LIGHTTPD_IPK=$(BUILD_DIR)/$(LIGHTTPD)_mipsel.ipk
--- ../lighttpd-1.4.11/src/Makefile.am 2006-03-07 14:20:20.000000000 +0200
-+++ lighttpd-1.4.12/src/Makefile.am 2006-07-19 20:02:55.000000000 +0300
-@@ -16,18 +16,24 @@
++++ lighttpd-1.5.0/src/Makefile.am 2006-09-07 00:57:05.000000000 +0300
+@@ -16,11 +16,26 @@
else
configparser.y: lemon
mod_ssi_exprparser.y: lemon
+http_resp_parser.y: lemon
++http_req_parser.y: lemon
++http_req_range_parser.y: lemon
configparser.c configparser.h: configparser.y
rm -f configparser.h
-- $(LEMON) -q $(srcdir)/configparser.y $(srcdir)/lempar.c
-+ $(LEMON) -q $(srcdir)/$< $(srcdir)/lempar.c
-+
+ $(LEMON) -q $(srcdir)/configparser.y $(srcdir)/lempar.c
+
+http_resp_parser.c http_resp_parser.h: http_resp_parser.y
+ rm -f http_resp_parser.h
-+ $(LEMON) -q $(srcdir)/$< $(srcdir)/lempar.c
-
++ $(LEMON) -q $(srcdir)/http_resp_parser.y $(srcdir)/lempar.c
++
++http_req_parser.c http_req_parser.h: http_req_parser.y
++ rm -f http_req_parser.h
++ $(LEMON) -q $(srcdir)/http_req_parser.y $(srcdir)/lempar.c
++
++http_req_range_parser.c http_req_range_parser.h: http_req_range_parser.y
++ rm -f http_req_parser.h
++ $(LEMON) -q $(srcdir)/http_req_range_parser.y $(srcdir)/lempar.c
++
mod_ssi_exprparser.c mod_ssi_exprparser.h: mod_ssi_exprparser.y
rm -f mod_ssi_exprparser.h
-- $(LEMON) -q $(srcdir)/mod_ssi_exprparser.y $(srcdir)/lempar.c
-+ $(LEMON) -q $(srcdir)/$< $(srcdir)/lempar.c
- endif
+ $(LEMON) -q $(srcdir)/mod_ssi_exprparser.y $(srcdir)/lempar.c
+@@ -28,10 +43,13 @@
configfile.c: configparser.h
mod_ssi_expr.c: mod_ssi_exprparser.h
+http_resp.c: http_resp_parser.h
++http_req.c: http_req_parser.h
++http_req_range.c: http_req_range_parser.h
common_src=buffer.c log.c \
keyvalue.c chunk.c \
-@@ -40,13 +46,13 @@
+- http_chunk.c stream.c fdevent.c \
++ stream.c fdevent.c \
+ stat_cache.c plugin.c joblist.c etag.c array.c \
+ data_string.c data_count.c data_array.c \
+ data_integer.c md5.c data_fastcgi.c \
+@@ -40,13 +58,16 @@
fdevent_solaris_devpoll.c fdevent_freebsd_kqueue.c \
data_config.c bitset.c \
inet_ntop_cache.c crc32.c \
@@ -848,11 +863,26 @@
network_freebsd_sendfile.c network_writev.c \
network_solaris_sendfilev.c network_openssl.c \
- splaytree.c
-+ splaytree.c http_resp.c http_resp_parser.c
++ splaytree.c \
++ http_resp.c http_resp_parser.c \
++ http_req.c http_req_parser.c \
++ http_req_range.c http_req_range_parser.c
src = server.c response.c connections.c network.c \
configfile.c configparser.c request.c proc_open.c
-@@ -82,9 +88,9 @@
+@@ -75,6 +96,11 @@
+ mod_flv_streaming_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
+ mod_flv_streaming_la_LIBADD = $(common_libadd)
+
++lib_LTLIBRARIES += mod_uploadprogress.la
++mod_uploadprogress_la_SOURCES = mod_uploadprogress.c
++mod_uploadprogress_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
++mod_uploadprogress_la_LIBADD = $(common_libadd)
++
+ lib_LTLIBRARIES += mod_evasive.la
+ mod_evasive_la_SOURCES = mod_evasive.c
+ mod_evasive_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
+@@ -82,9 +108,9 @@
lib_LTLIBRARIES += mod_webdav.la
mod_webdav_la_SOURCES = mod_webdav.c
@@ -864,7 +894,7 @@
lib_LTLIBRARIES += mod_cml.la
mod_cml_la_SOURCES = mod_cml.c mod_cml_lua.c mod_cml_funcs.c
-@@ -103,6 +109,11 @@
+@@ -103,6 +129,11 @@
mod_mysql_vhost_la_LIBADD = $(MYSQL_LIBS) $(common_libadd)
mod_mysql_vhost_la_CPPFLAGS = $(MYSQL_INCLUDE)
@@ -876,14 +906,15 @@
lib_LTLIBRARIES += mod_cgi.la
mod_cgi_la_SOURCES = mod_cgi.c
mod_cgi_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
-@@ -158,6 +169,14 @@
+@@ -158,6 +189,15 @@
mod_proxy_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
mod_proxy_la_LIBADD = $(common_libadd)
+lib_LTLIBRARIES += mod_proxy_core.la
+mod_proxy_core_la_SOURCES = mod_proxy_core.c mod_proxy_core_pool.c \
+ mod_proxy_core_backend.c mod_proxy_core_address.c \
-+ mod_proxy_core_backlog.c mod_proxy_core_rewrites.c
++ mod_proxy_core_backlog.c mod_proxy_core_rewrites.c \
++ mod_proxy_backend_http.c mod_proxy_backend_fastcgi.c
+mod_proxy_core_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
+mod_proxy_core_la_LIBADD = $(common_libadd) $(PCRE_LIB)
+
@@ -891,29 +922,56 @@
lib_LTLIBRARIES += mod_ssi.la
mod_ssi_la_SOURCES = mod_ssi_exprparser.c mod_ssi_expr.c mod_ssi.c
mod_ssi_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
-@@ -240,7 +259,13 @@
+@@ -231,7 +271,7 @@
+
+ hdr = server.h buffer.h network.h log.h keyvalue.h \
+ response.h request.h fastcgi.h chunk.h \
+- settings.h http_chunk.h http_auth_digest.h \
++ settings.h http_auth_digest.h \
+ md5.h http_auth.h stream.h \
+ fdevent.h connections.h base.h stat_cache.h \
+ plugin.h mod_auth.h \
+@@ -240,7 +280,25 @@
mod_ssi.h mod_ssi_expr.h inet_ntop_cache.h \
configparser.h mod_ssi_exprparser.h \
sys-mmap.h sys-socket.h mod_cml.h mod_cml_funcs.h \
- splaytree.h proc_open.h
-+ splaytree.h proc_open.h http_resp.h mod_sql_vhost_core.h \
-+ sys-files.h sys-process.h sys-strings.h http_resp_parser.h \
++ splaytree.h proc_open.h mod_sql_vhost_core.h \
++ sys-files.h sys-process.h sys-strings.h \
+ iosocket.h array-static.h \
-+ mod_proxy_core_address.h mod_proxy_core_backend.h \
-+ mod_proxy_core_backlog.h mod_proxy_core.h \
-+ mod_proxy_core_pool.h mod_proxy_core_rewrites.h \
-+ status_counter.h
++ mod_proxy_core_address.h \
++ mod_proxy_core_backend.h \
++ mod_proxy_core_backlog.h \
++ mod_proxy_core.h \
++ mod_proxy_core_pool.h \
++ mod_proxy_core_rewrites.h \
++ mod_proxy_backend_http.h \
++ mod_proxy_backend_fastcgi.h \
++ status_counter.h \
++ http_req.h \
++ http_req_parser.h \
++ http_req_range.h \
++ http_req_range_parser.h \
++ http_resp.h \
++ http_resp_parser.h \
++ http_parser.h
DEFS= @DEFS@ -DLIBRARY_DIR="\"$(libdir)\""
-@@ -267,4 +292,4 @@
+@@ -267,4 +325,10 @@
#ajp_SOURCES = ajp.c
noinst_HEADERS = $(hdr)
-EXTRA_DIST = mod_skeleton.c configparser.y mod_ssi_exprparser.y lempar.c
-+EXTRA_DIST = mod_skeleton.c configparser.y mod_ssi_exprparser.y lempar.c http_resp_parser.y
++EXTRA_DIST = mod_skeleton.c \
++ configparser.y \
++ mod_ssi_exprparser.y \
++ lempar.c \
++ http_resp_parser.y \
++ http_req_parser.y \
++ http_req_range_parser.y
--- ../lighttpd-1.4.11/src/array-static.h 1970-01-01 03:00:00.000000000 +0300
-+++ lighttpd-1.4.12/src/array-static.h 2006-07-18 13:03:40.000000000 +0300
++++ lighttpd-1.5.0/src/array-static.h 2006-07-18 13:03:40.000000000 +0300
@@ -0,0 +1,33 @@
+#ifndef _ARRAY_STATIC_H_
+#define _ARRAY_STATIC_H_
@@ -949,7 +1007,7 @@
+
+#endif
--- ../lighttpd-1.4.11/src/array.c 2005-11-18 13:58:32.000000000 +0200
-+++ lighttpd-1.4.12/src/array.c 2006-07-16 00:26:03.000000000 +0300
++++ lighttpd-1.5.0/src/array.c 2006-07-16 00:26:03.000000000 +0300
@@ -11,12 +11,12 @@
array *array_init(void) {
@@ -1239,7 +1297,7 @@
}
#endif
--- ../lighttpd-1.4.11/src/array.h 2005-09-23 21:24:18.000000000 +0300
-+++ lighttpd-1.4.12/src/array.h 2006-07-16 00:26:03.000000000 +0300
++++ lighttpd-1.5.0/src/array.h 2006-09-07 00:57:05.000000000 +0300
@@ -16,7 +16,7 @@
#define DATA_UNSET \
data_type_t type; \
@@ -1285,7 +1343,7 @@
buffer *value;
} data_string;
-@@ -60,7 +60,7 @@
+@@ -60,21 +60,39 @@
typedef struct {
DATA_UNSET;
@@ -1294,8 +1352,35 @@
array *value;
} data_array;
-@@ -74,7 +74,7 @@
- COMP_SERVER_SOCKET, COMP_HTTP_URL, COMP_HTTP_HOST, COMP_HTTP_REFERER, COMP_HTTP_USERAGENT, COMP_HTTP_COOKIE, COMP_HTTP_REMOTEIP
+ data_array *data_array_init(void);
+
+-typedef enum { CONFIG_COND_UNSET, CONFIG_COND_EQ, CONFIG_COND_MATCH, CONFIG_COND_NE, CONFIG_COND_NOMATCH } config_cond_t;
++/**
++ * possible compare ops in the configfile parser
++ */
++typedef enum {
++ CONFIG_COND_UNSET,
++ CONFIG_COND_EQ, /** == */
++ CONFIG_COND_MATCH, /** =~ */
++ CONFIG_COND_NE, /** != */
++ CONFIG_COND_NOMATCH /** !~ */
++} config_cond_t;
+
+-#define PATCHES NULL, "SERVERsocket", "HTTPurl", "HTTPhost", "HTTPreferer", "HTTPuseragent", "HTTPcookie", "HTTPremoteip"
++/**
++ * possible fields to match against
++ */
+ typedef enum {
+ COMP_UNSET,
+- COMP_SERVER_SOCKET, COMP_HTTP_URL, COMP_HTTP_HOST, COMP_HTTP_REFERER, COMP_HTTP_USERAGENT, COMP_HTTP_COOKIE, COMP_HTTP_REMOTEIP
++ COMP_SERVER_SOCKET,
++ COMP_HTTP_URL,
++ COMP_HTTP_HOST,
++ COMP_HTTP_REFERER,
++ COMP_HTTP_USERAGENT,
++ COMP_HTTP_COOKIE,
++ COMP_HTTP_REMOTEIP,
++ COMP_HTTP_QUERYSTRING
} comp_key_t;
-/* $HTTP["host"] == "incremental.home.kneschke.de" { ... }
@@ -1303,7 +1388,7 @@
* for print: comp_key op string
* for compare: comp cond string/regex
*/
-@@ -82,15 +82,15 @@
+@@ -82,15 +100,15 @@
typedef struct _data_config data_config;
struct _data_config {
DATA_UNSET;
@@ -1323,7 +1408,7 @@
int context_ndx; /* more or less like an id */
array *childs;
/* nested */
-@@ -98,7 +98,7 @@
+@@ -98,7 +116,7 @@
/* for chaining only */
data_config *prev;
data_config *next;
@@ -1332,7 +1417,7 @@
buffer *string;
#ifdef HAVE_PCRE_H
pcre *regex;
-@@ -110,7 +110,7 @@
+@@ -110,7 +128,7 @@
typedef struct {
DATA_UNSET;
@@ -1341,7 +1426,7 @@
int value;
} data_integer;
-@@ -120,13 +120,13 @@
+@@ -120,13 +138,13 @@
DATA_UNSET;
buffer *host;
@@ -1358,7 +1443,7 @@
int last_used_ndx; /* round robin */
} data_fastcgi;
--- ../lighttpd-1.4.11/src/base.h 2006-01-11 16:51:04.000000000 +0200
-+++ lighttpd-1.4.12/src/base.h 2006-07-19 20:02:55.000000000 +0300
++++ lighttpd-1.5.0/src/base.h 2006-09-07 00:57:05.000000000 +0300
@@ -2,7 +2,6 @@
#define _BASE_H_
@@ -1367,11 +1452,13 @@
#include <sys/stat.h>
#ifdef HAVE_CONFIG_H
-@@ -26,10 +25,9 @@
+@@ -25,11 +24,11 @@
+ #include "fdevent.h"
#include "sys-socket.h"
#include "splaytree.h"
-
-
++#include "http_req.h"
+
#if defined HAVE_LIBSSL && defined HAVE_OPENSSL_SSL_H
# define USE_OPENSSL
-# include <openssl/ssl.h>
@@ -1379,7 +1466,7 @@
#endif
#ifdef HAVE_FAM_H
-@@ -40,10 +38,6 @@
+@@ -40,10 +39,6 @@
# define O_BINARY 0
#endif
@@ -1390,7 +1477,7 @@
#ifndef SIZE_MAX
# ifdef SIZE_T_MAX
# define SIZE_MAX SIZE_T_MAX
-@@ -70,7 +64,8 @@
+@@ -70,7 +65,8 @@
/* solaris and NetBSD 1.3.x again */
#if (!defined(HAVE_STDINT_H)) && (!defined(HAVE_INTTYPES_H)) && (!defined(uint32_t))
@@ -1400,7 +1487,7 @@
#endif
-@@ -80,24 +75,24 @@
+@@ -80,24 +76,25 @@
#include "settings.h"
@@ -1410,13 +1497,15 @@
- T_CONFIG_BOOLEAN,
- T_CONFIG_ARRAY,
- T_CONFIG_LOCAL,
+- T_CONFIG_DEPRECATED
+typedef enum { T_CONFIG_UNSET,
+ T_CONFIG_STRING,
+ T_CONFIG_SHORT,
+ T_CONFIG_BOOLEAN,
+ T_CONFIG_ARRAY,
+ T_CONFIG_LOCAL,
- T_CONFIG_DEPRECATED
++ T_CONFIG_DEPRECATED,
++ T_CONFIG_UNSUPPORTED
} config_values_type_t;
-typedef enum { T_CONFIG_SCOPE_UNSET,
@@ -1434,7 +1523,7 @@
config_values_type_t type;
config_scope_type_t scope;
} config_values_t;
-@@ -118,18 +113,6 @@
+@@ -118,64 +115,38 @@
short factor;
} fcgi_connections;
@@ -1450,10 +1539,15 @@
- struct sockaddr plain;
-} sock_addr;
-
- /* fcgi_response_header contains ... */
- #define HTTP_STATUS BV(0)
- #define HTTP_CONNECTION BV(1)
-@@ -142,40 +125,40 @@
+-/* fcgi_response_header contains ... */
+-#define HTTP_STATUS BV(0)
+-#define HTTP_CONNECTION BV(1)
+-#define HTTP_CONTENT_LENGTH BV(2)
+-#define HTTP_DATE BV(3)
+-#define HTTP_LOCATION BV(4)
+-
+ typedef struct {
+ /** HEADER */
/* the request-line */
buffer *request;
buffer *uri;
@@ -1465,24 +1559,25 @@
http_method_t http_method;
http_version_t http_version;
-
-+
- buffer *request_line;
+- buffer *request_line;
-
-+
- /* strings to the header */
- buffer *http_host; /* not alloced */
- const char *http_range;
- const char *http_content_type;
- const char *http_if_modified_since;
- const char *http_if_none_match;
+- /* strings to the header */
+- buffer *http_host; /* not alloced */
+- const char *http_range;
+- const char *http_content_type;
+- const char *http_if_modified_since;
+- const char *http_if_none_match;
-
+
++ buffer *http_host;
++
array *headers;
-
+
/* CONTENT */
- size_t content_length; /* returned by strtoul() */
+- size_t content_length; /* returned by strtoul() */
-
++ off_t content_length; /* returned by strtoul() */
+
/* internal representation */
int accept_encoding;
@@ -1506,7 +1601,7 @@
HTTP_TRANSFER_ENCODING_IDENTITY, HTTP_TRANSFER_ENCODING_CHUNKED
} transfer_encoding;
} response;
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/lighttpd-branch.diff?r1=1.10&r2=1.11&f=u
More information about the pld-cvs-commit
mailing list