SOURCES: lighttpd-branch.diff - svn 1199

glen glen at pld-linux.org
Tue Jul 18 12:05:19 CEST 2006 

Author: glen                         Date: Tue Jul 18 10:05:19 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- svn 1199

---- Files affected:
SOURCES:
   lighttpd-branch.diff (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SOURCES/lighttpd-branch.diff
diff -u SOURCES/lighttpd-branch.diff:1.6 SOURCES/lighttpd-branch.diff:1.7
--- SOURCES/lighttpd-branch.diff:1.6	Sat Jul 15 22:40:32 2006
+++ SOURCES/lighttpd-branch.diff	Tue Jul 18 12:05:14 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-11 22:07:54.000000000 +0300
++++ lighttpd-1.4.12/NEWS	2006-07-16 00:26:05.000000000 +0300
 @@ -3,6 +3,23 @@
  NEWS
  ====
@@ -25,7 +25,7 @@
  
    * 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-15 22:43:22.000000000 +0300
++++ lighttpd-1.4.12/configure.in	2006-07-16 00:26:05.000000000 +0300
 @@ -1,7 +1,7 @@
  #                                               -*- Autoconf -*-
  # Process this file with autoconf to produce a configure script.
@@ -135,7 +135,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-11 22:08:04.000000000 +0300
++++ lighttpd-1.4.12/cygwin/lighttpd.README	2006-07-17 22:02:18.000000000 +0300
 @@ -1,114 +1,114 @@
 -lighttpd
 -------------------------------------------
@@ -366,7 +366,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-11 22:07:53.000000000 +0300
++++ lighttpd-1.4.12/cygwin/lighttpd.README.in	2006-07-16 00:26:04.000000000 +0300
 @@ -1,114 +1,114 @@
 -lighttpd
 -------------------------------------------
@@ -597,7 +597,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-11 22:07:54.000000000 +0300
++++ lighttpd-1.4.12/doc/authentication.txt	2006-07-16 00:26:05.000000000 +0300
 @@ -7,8 +7,8 @@
  ----------------
  
@@ -610,7 +610,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-11 22:07:54.000000000 +0300
++++ lighttpd-1.4.12/doc/compress.txt	2006-07-16 00:26:05.000000000 +0300
 @@ -22,12 +22,38 @@
  ===========
  
@@ -685,7 +685,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-11 22:07:54.000000000 +0300
++++ lighttpd-1.4.12/doc/configuration.txt	2006-07-16 00:26:05.000000000 +0300
 @@ -7,8 +7,8 @@
  ------------
  
@@ -709,7 +709,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-11 22:07:54.000000000 +0300
++++ lighttpd-1.4.12/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
@@ -722,7 +722,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-11 22:07:54.000000000 +0300
++++ lighttpd-1.4.12/doc/lighttpd.conf	2006-07-16 00:26:05.000000000 +0300
 @@ -172,10 +172,11 @@
  #dir-listing.activate       = "enable"
  
@@ -740,7 +740,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-11 22:07:54.000000000 +0300
++++ lighttpd-1.4.12/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
@@ -751,7 +751,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-11 22:07:54.000000000 +0300
++++ lighttpd-1.4.12/doc/secdownload.txt	2006-07-16 00:26:05.000000000 +0300
 @@ -118,7 +118,7 @@
    $secret = "verysecret";
    $uri_prefix = "/dl/";
@@ -762,7 +762,7 @@
    
    # current timestamp
 --- ../lighttpd-1.4.11/lighttpd.spec	2006-03-07 14:22:18.000000000 +0200
-+++ lighttpd-1.4.12/lighttpd.spec	2006-07-11 22:07:58.000000000 +0300
++++ lighttpd-1.4.12/lighttpd.spec	2006-07-17 22:02:18.000000000 +0300
 @@ -1,6 +1,6 @@
  Summary: A fast webserver with minimal memory-footprint (lighttpd)
  Name: lighttpd
@@ -772,7 +772,7 @@
  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-11 22:08:05.000000000 +0300
++++ lighttpd-1.4.12/openwrt/control	2006-07-17 22:02:18.000000000 +0300
 @@ -1,8 +1,8 @@
  Package: lighttpd
 -Version: 1.4.11
@@ -785,7 +785,7 @@
  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-11 22:08:05.000000000 +0300
++++ lighttpd-1.4.12/openwrt/lighttpd.mk	2006-07-17 22:02:18.000000000 +0300
 @@ -10,7 +10,7 @@
  
  #  For this example we'll use a fairly simple package that compiles easily
@@ -796,7 +796,7 @@
  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-15 23:38:00.000000000 +0300
++++ lighttpd-1.4.12/src/Makefile.am	2006-07-18 13:03:40.000000000 +0300
 @@ -16,18 +16,24 @@
  else
  configparser.y: lemon
@@ -824,7 +824,14 @@
  
  common_src=buffer.c log.c \
        keyvalue.c chunk.c  \
-@@ -46,7 +52,7 @@
+@@ -40,13 +46,13 @@
+       fdevent_solaris_devpoll.c fdevent_freebsd_kqueue.c \
+       data_config.c bitset.c \
+       inet_ntop_cache.c crc32.c \
+-      connections-glue.c \
++      connections-glue.c iosocket.c \
+       configfile-glue.c \
+       http-header-glue.c \
        network_write.c network_linux_sendfile.c \
        network_freebsd_sendfile.c network_writev.c \
        network_solaris_sendfilev.c network_openssl.c \
@@ -857,24 +864,78 @@
  lib_LTLIBRARIES += mod_cgi.la
  mod_cgi_la_SOURCES = mod_cgi.c 
  mod_cgi_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
-@@ -240,7 +251,8 @@
+@@ -158,6 +169,13 @@
+ 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_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
++mod_proxy_core_la_LIBADD = $(common_libadd)
++
++
+ 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 +258,12 @@
        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
++      sys-files.h sys-process.h sys-strings.h http_resp_parser.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
  
  DEFS= @DEFS@ -DLIBRARY_DIR="\"$(libdir)\""
  
-@@ -267,4 +279,4 @@
+@@ -267,4 +290,4 @@
  #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
+--- ../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
+@@ -0,0 +1,33 @@
++#ifndef _ARRAY_STATIC_H_
++#define _ARRAY_STATIC_H_
++
++/* define a generic array of <type>
++ * */
++
++#define ARRAY_STATIC_DEF(name, type, extra) \
++typedef struct { \
++	type **ptr; \
++	size_t used; \
++	size_t size; \
++	extra\
++} name
++
++/* all append operations need a 'resize' for the +1 */
++
++#define ARRAY_STATIC_PREPARE_APPEND(a) \
++        if (a->size == 0) { \
++	        a->size = 16; \
++	        a->ptr = malloc(a->size * sizeof(*(a->ptr))); \
++	} else if (a->size == a->used) { \
++		a->size += 16; \
++		a->ptr = realloc(a->ptr, a->size * sizeof(*(a->ptr))); \
++	}
++	
++#define FOREACH(array, element, func) \
++do { size_t _i; for (_i = 0; _i < array->used; _i++) { void *element = array->ptr[_i]; func; } } while(0);
++
++#define STRUCT_INIT(type, var) \
++	type *var;\
++	var = calloc(1, sizeof(*var))
++
++#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-11 22:07:51.000000000 +0300
++++ lighttpd-1.4.12/src/array.c	2006-07-16 00:26:03.000000000 +0300
 @@ -11,12 +11,12 @@
  
  array *array_init(void) {
@@ -1164,7 +1225,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-11 22:07:51.000000000 +0300
++++ lighttpd-1.4.12/src/array.h	2006-07-16 00:26:03.000000000 +0300
 @@ -16,7 +16,7 @@
  #define DATA_UNSET \
  	data_type_t type; \
@@ -1283,7 +1344,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-15 22:43:21.000000000 +0300
++++ lighttpd-1.4.12/src/base.h	2006-07-18 13:03:40.000000000 +0300
 @@ -2,7 +2,6 @@
  #define _BASE_H_
  
@@ -1458,7 +1519,7 @@
  #ifdef HAVE_FAM_H
  	int    dir_version;
  	int    dir_ndx;
-@@ -215,8 +198,8 @@
+@@ -215,20 +198,20 @@
  } stat_cache_entry;
  
  typedef struct {
@@ -1469,7 +1530,12 @@
  	buffer *dir_name; /* for building the dirname from the filename */
  #ifdef HAVE_FAM_H
  	splay_tree *dirs; /* the nodes of the tree are fam_dir_entry */
-@@ -228,7 +211,7 @@
+ 
+ 	FAMConnection *fam;
+-	int    fam_fcce_ndx;
++	iosocket *sock;
+ #endif
+ } stat_cache;
  
  typedef struct {
  	array *mimetypes;
@@ -1569,7 +1635,7 @@
  } connection_state_t;
  
  typedef enum { COND_RESULT_UNSET, COND_RESULT_FALSE, COND_RESULT_TRUE } cond_result_t;
-@@ -315,88 +299,88 @@
+@@ -315,91 +299,86 @@
  
  typedef struct {
  	connection_state_t state;
@@ -1596,9 +1662,10 @@
  				      * this is self-protection
  				      */
 -	
+-	int fd;                      /* the FD for this connection */
+-	int fde_ndx;                 /* index for the fdevent-handler */
 +
- 	int fd;                      /* the FD for this connection */
- 	int fde_ndx;                 /* index for the fdevent-handler */
++	iosocket *sock;
  	int ndx;                     /* reverse mapping to server->connection[ndx] */
 -	
 +
@@ -1682,11 +1749,13 @@
 +
  	void *srv_socket;   /* reference to the server-socket (typecast to server_socket) */
 -	
-+
- #ifdef USE_OPENSSL
- 	SSL *ssl;
- #endif
-@@ -439,39 +423,48 @@
+-#ifdef USE_OPENSSL
+-	SSL *ssl;
+-#endif
+ } connection;
+ 
+ typedef struct {
+@@ -439,55 +418,63 @@
  	size_t size;
  } buffer_plugin;
  
@@ -1703,9 +1772,8 @@
  	unsigned short port;
  	buffer *bindhost;
 -	
-+
- 	buffer *errorlog_file;
- 	unsigned short errorlog_use_syslog;
+-	buffer *errorlog_file;
+-	unsigned short errorlog_use_syslog;
 -	
 +
  	unsigned short dont_daemonize;
@@ -1746,12 +1814,17 @@
 +			STAT_CACHE_ENGINE_FAM
  	} stat_cache_engine;
  	unsigned short enable_cores;
++
++	buffer *errorlog_file;
++	unsigned short errorlog_use_syslog;
  } server_config;
-@@ -480,14 +473,14 @@
+ 
+ typedef struct {
  	sock_addr addr;
- 	int       fd;
- 	int       fde_ndx;
+-	int       fd;
+-	int       fde_ndx;
 -	
++	iosocket *sock;
 +
  	buffer *ssl_pemfile;
  	buffer *ssl_ca_file;
@@ -1765,7 +1838,7 @@
  #ifdef USE_OPENSSL
  	SSL_CTX *ssl_ctx;
  #endif
-@@ -495,37 +488,37 @@
+@@ -495,37 +482,32 @@
  
  typedef struct {
  	server_socket **ptr;
@@ -1778,11 +1851,10 @@
  typedef struct server {
  	server_socket_array srv_sockets;
 -	
-+
- 	/* the errorlog */
- 	int errorlog_fd;
- 	enum { ERRORLOG_STDERR, ERRORLOG_FILE, ERRORLOG_SYSLOG } errorlog_mode;
- 	buffer *errorlog_buf;
+-	/* the errorlog */
+-	int errorlog_fd;
+-	enum { ERRORLOG_STDERR, ERRORLOG_FILE, ERRORLOG_SYSLOG } errorlog_mode;
+-	buffer *errorlog_buf;
 -	
 +
  	fdevents *ev, *ev_ins;
@@ -1811,7 +1883,7 @@
  	size_t max_conns;
  
  	/* buffers */
-@@ -533,13 +526,13 @@
+@@ -533,13 +515,13 @@
  	buffer *response_header;
  	buffer *response_range;
  	buffer *tmp_buf;
@@ -1828,7 +1900,7 @@
  	/* caches */
  #ifdef HAVE_IPV6
  	inet_ntop_cache_type inet_ntop_cache[INET_NTOP_CACHE_MAX];
-@@ -547,31 +540,31 @@
+@@ -547,31 +529,31 @@
  	mtime_cache_type mtime_cache[FILE_CACHE_MAX];
  
  	array *split_vals;
@@ -1868,7 +1940,7 @@
  	stat_cache  *stat_cache;
  
  	/**
-@@ -588,18 +581,20 @@
+@@ -588,18 +570,20 @@
  	 *   fastcgi.backend.<key>.disconnects = ...
  	 */
  	array *status;
@@ -1878,13 +1950,13 @@
  
 -	int (* network_backend_write)(struct server *srv, connection *con, int fd, chunkqueue *cq);
 -	int (* network_backend_read)(struct server *srv, connection *con, int fd, chunkqueue *cq);
-+	network_status_t (* network_backend_write)(struct server *srv, connection *con, int fd, chunkqueue *cq);
-+	network_status_t (* network_backend_read)(struct server *srv, connection *con, int fd, chunkqueue *cq);
++	network_status_t (* network_backend_write)(struct server *srv, connection *con, iosocket *sock, chunkqueue *cq);
++	network_status_t (* network_backend_read)(struct server *srv, connection *con, iosocket *sock, chunkqueue *cq);
  #ifdef USE_OPENSSL
 -	int (* network_ssl_backend_write)(struct server *srv, connection *con, SSL *ssl, chunkqueue *cq);
 -	int (* network_ssl_backend_read)(struct server *srv, connection *con, SSL *ssl, chunkqueue *cq);
-+	network_status_t (* network_ssl_backend_write)(struct server *srv, connection *con, SSL *ssl, chunkqueue *cq);
-+	network_status_t (* network_ssl_backend_read)(struct server *srv, connection *con, SSL *ssl, chunkqueue *cq);
++	network_status_t (* network_ssl_backend_write)(struct server *srv, connection *con, iosocket *sock, chunkqueue *cq);
++	network_status_t (* network_ssl_backend_read)(struct server *srv, connection *con, iosocket *sock, chunkqueue *cq);
  #endif
  
 +#ifdef HAVE_PWD_H
@@ -1894,8 +1966,18 @@
  } server;
  
  
+--- ../lighttpd-1.4.11/src/bitset.c	2005-08-22 01:54:12.000000000 +0300
++++ lighttpd-1.4.12/src/bitset.c	2006-07-18 13:03:40.000000000 +0300
+@@ -6,6 +6,7 @@
+ 
+ #include "bitset.h"
+ #include "buffer.h"
++#include "log.h"
+ 
+ #define BITSET_BITS \
+ 	( CHAR_BIT * sizeof(size_t) )
 --- ../lighttpd-1.4.11/src/buffer.c	2006-01-13 00:00:45.000000000 +0200
-+++ lighttpd-1.4.12/src/buffer.c	2006-07-11 22:07:52.000000000 +0300
++++ lighttpd-1.4.12/src/buffer.c	2006-07-18 13:03:40.000000000 +0300
 @@ -12,20 +12,20 @@
  
  
@@ -2297,7 +2379,13 @@
   * HISTORY: this function was pretty much optimized, but didn't handled
   * alignment properly.
   */
-@@ -522,100 +591,100 @@
+@@ -517,105 +586,105 @@
+ 	if (a->used != b->used) return 0;
+ 	if (a->used == 0) return 1;
+ 
+-	return (0 == strcmp(a->ptr, b->ptr));
++	return (0 == strncmp(a->ptr, b->ptr, a->used - 1));
+ }
  
  int buffer_is_equal_string(buffer *a, const char *s, size_t b_len) {
  	buffer b;
@@ -2483,7 +2571,7 @@
  	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  /*  70 -  7F */
  	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  /*  80 -  8F */
  	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  /*  90 -  9F */
-@@ -734,13 +803,13 @@
+@@ -734,13 +803,12 @@
  	unsigned char *ds, *d;
  	size_t d_len, ndx;
  	const char *map = NULL;
@@ -2491,16 +2579,18 @@
 +
  	if (!s || !b) return -1;
 -	
-+
- 	if (b->ptr[b->used - 1] != '\0') {
- 		SEGFAULT();
- 	}
+-	if (b->ptr[b->used - 1] != '\0') {
+-		SEGFAULT();
+-	}
 -	
++	if (b->used == 0) return -1;
++
++	if (b->ptr[b->used - 1] != '\0') return -1;
 +
  	if (s_len == 0) return 0;
  
  	switch(encoding) {
-@@ -760,12 +829,12 @@
+@@ -760,12 +828,12 @@
  		map = encoded_chars_hex;
  		break;
  	case ENCODING_UNSET:
@@ -2516,7 +2606,7 @@
  	for (ds = (unsigned char *)s, d_len = 0, ndx = 0; ndx < s_len; ds++, ndx++) {
  		if (map[*ds]) {
  			switch(encoding) {
-@@ -787,9 +856,9 @@
+@@ -787,9 +855,9 @@
  			d_len ++;
  		}
  	}
@@ -2528,7 +2618,7 @@
  	for (ds = (unsigned char *)s, d = (unsigned char *)b->ptr + b->used - 1, d_len = 0, ndx = 0; ndx < s_len; ds++, ndx++) {
  		if (map[*ds]) {
  			switch(encoding) {
-@@ -820,16 +889,16 @@
+@@ -820,16 +888,16 @@
  		}
  	}
  
@@ -2548,7 +2638,7 @@
   * replaces non-printable characters with '_'
   */
  
-@@ -854,10 +923,10 @@
+@@ -854,10 +922,10 @@
  				low = hex2int(*(src + 2));
  				if (low != 0xFF) {
  					high = (high << 4) | low;
@@ -2562,7 +2652,7 @@
  					*dst = high;
  					src += 2;
  				}
-@@ -891,7 +960,7 @@
+@@ -891,7 +959,7 @@
   * /abc/./xyz       gets  /abc/xyz
   * /abc//xyz        gets  /abc/xyz
   *
@@ -2571,7 +2661,7 @@
   *       the operation is performed in-place.
   */
  
-@@ -979,7 +1048,7 @@
+@@ -979,7 +1047,7 @@
  
  int light_isxdigit(int c) {
  	if (light_isdigit(c)) return 1;
@@ -2580,7 +2670,7 @@
  	c |= 32;
  	return (c >= 'a' && c <= 'f');
  }
-@@ -993,31 +1062,56 @@
+@@ -993,31 +1061,56 @@
  	return light_isdigit(c) || light_isalpha(c);
  }
  
@@ -2644,8 +2734,8 @@
  	return 0;
  }
 --- ../lighttpd-1.4.11/src/buffer.h	2006-01-13 00:00:45.000000000 +0200
-+++ lighttpd-1.4.12/src/buffer.h	2006-07-11 22:07:52.000000000 +0300
-@@ -12,27 +12,44 @@
++++ lighttpd-1.4.12/src/buffer.h	2006-07-18 13:03:40.000000000 +0300
+@@ -12,27 +12,43 @@
  
  typedef struct {
  	char *ptr;
@@ -2655,7 +2745,6 @@
  	size_t size;
  } buffer;
  
-+
 +typedef void (*buffer_ptr_free_t)(void *p);
 +
 +typedef struct {
@@ -2696,7 +2785,7 @@
  buffer_array* buffer_array_init(void);
  void buffer_array_free(buffer_array *b);
  void buffer_array_reset(buffer_array *b);
-@@ -43,7 +60,7 @@
+@@ -43,7 +59,7 @@
  buffer* buffer_init_string(const char *str);
  void buffer_free(buffer *b);
  void buffer_reset(buffer *b);
@@ -2705,7 +2794,7 @@
  int buffer_prepare_copy(buffer *b, size_t size);
  int buffer_prepare_append(buffer *b, size_t size);
  
-@@ -85,9 +102,9 @@
+@@ -85,9 +101,9 @@
  
  typedef enum {
  	ENCODING_UNSET,
@@ -2718,7 +2807,7 @@
  	ENCODING_MINIMAL_XML, /* minimal encoding for xml */
  	ENCODING_HEX      /* encode string as hex */
  } buffer_encoding_t;
-@@ -111,19 +128,21 @@
+@@ -111,20 +127,23 @@
  int light_isalpha(int c);
  int light_isalnum(int c);
  
@@ -2728,6 +2817,7 @@
 +BUFFER_CTYPE_FUNC(alpha)
 +BUFFER_CTYPE_FUNC(alnum)
 +
++#define BUF_STR(x) x->ptr
  #define BUFFER_APPEND_STRING_CONST(x, y) \
  	buffer_append_string_len(x, y, sizeof(y) - 1)
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/lighttpd-branch.diff?r1=1.6&r2=1.7&f=u

More information about the pld-cvs-commit mailing list