]> git.pld-linux.org Git - packages/lighttpd.git/blame - lighttpd-branch.diff
projects / packages / lighttpd.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- skip configure.in chunk for version bump
[packages/lighttpd.git] / lighttpd-branch.diff
CommitLineData
1e1cc0d1
ER		 1Index: configure.in
2===================================================================
09cf44bb
ER		 3Index: src/configfile-glue.c
4===================================================================
49b4da39
ER		 5--- src/configfile-glue.c (.../tags/lighttpd-1.4.19) (revision 2145)
6+++ src/configfile-glue.c (.../branches/lighttpd-1.4.x) (revision 2145)
7@@ -529,7 +529,7 @@
8 int config_append_cond_match_buffer(connection *con, data_config *dc, buffer *buf, int n)
9 {
10 cond_cache_t *cache = &con->cond_cache[dc->context_ndx];
11- if (n > cache->patterncount) {
12+ if (n >= cache->patterncount) {
13 return 0;
a34aaa25 14 }
36650255 15
a34aaa25
ER		 16Index: src/connections.c
17===================================================================
49b4da39
ER		 18--- src/connections.c (.../tags/lighttpd-1.4.19) (revision 2145)
19+++ src/connections.c (.../branches/lighttpd-1.4.x) (revision 2145)
20@@ -199,6 +199,7 @@
a34aaa25 21
49b4da39 22 /* don't resize the buffer if we were in SSL_ERROR_WANT_* */
a34aaa25 23
49b4da39
ER		 24+ ERR_clear_error();
25 do {
26 if (!con->ssl_error_want_reuse_buffer) {
27 b = buffer_init();
28@@ -1668,21 +1669,51 @@
a34aaa25 29 }
a34aaa25 30 #ifdef USE_OPENSSL
49b4da39
ER		 31 if (srv_sock->is_ssl) {
32- int ret;
33+ int ret, ssl_r;
34+ unsigned long err;
35+ ERR_clear_error();
36 switch ((ret = SSL_shutdown(con->ssl))) {
37 case 1:
38 /* ok */
a34aaa25 39 break;
49b4da39
ER		 40 case 0:
41- SSL_shutdown(con->ssl);
42- break;
43+ ERR_clear_error();
44+ if (-1 != (ret = SSL_shutdown(con->ssl))) break;
45+
46+ /* fall through */
47 default:
48- log_error_write(srv, __FILE__, __LINE__, "sds", "SSL:",
49- SSL_get_error(con->ssl, ret),
50- ERR_error_string(ERR_get_error(), NULL));
51- return -1;
a34aaa25 52+
49b4da39
ER		 53+ switch ((ssl_r = SSL_get_error(con->ssl, ret))) {
54+ case SSL_ERROR_WANT_WRITE:
55+ case SSL_ERROR_WANT_READ:
56+ break;
57+ case SSL_ERROR_SYSCALL:
58+ /* perhaps we have error waiting in our error-queue */
59+ if (0 != (err = ERR_get_error())) {
60+ do {
61+ log_error_write(srv, __FILE__, __LINE__, "sdds", "SSL:",
62+ ssl_r, ret,
63+ ERR_error_string(err, NULL));
64+ } while((err = ERR_get_error()));
65+ } else {
66+ log_error_write(srv, __FILE__, __LINE__, "sddds", "SSL (error):",
67+ ssl_r, ret, errno,
68+ strerror(errno));
69+ }
70+
71+ break;
72+ default:
73+ while((err = ERR_get_error())) {
74+ log_error_write(srv, __FILE__, __LINE__, "sdds", "SSL:",
75+ ssl_r, ret,
76+ ERR_error_string(err, NULL));
77+ }
78+
79+ break;
1e1cc0d1
ER		 80+ }
81 }
7db9a1b1 82 }
49b4da39 83+ ERR_clear_error();
7db9a1b1 84 #endif
7db9a1b1 85
49b4da39
ER		 86 switch(con->mode) {
87Index: src/response.c
88===================================================================
89--- src/response.c (.../tags/lighttpd-1.4.19) (revision 2145)
90+++ src/response.c (.../branches/lighttpd-1.4.x) (revision 2145)
91@@ -101,7 +101,7 @@
92 if (!have_server) {
93 if (buffer_is_empty(con->conf.server_tag)) {
94 BUFFER_APPEND_STRING_CONST(b, "\r\nServer: " PACKAGE_NAME "/" PACKAGE_VERSION);
7db9a1b1 95- } else {
49b4da39
ER		 96+ } else if (con->conf.server_tag->used > 1) {
97 BUFFER_APPEND_STRING_CONST(b, "\r\nServer: ");
98 buffer_append_string_encoded(b, CONST_BUF_LEN(con->conf.server_tag), ENCODING_HTTP_HEADER);
7db9a1b1 99 }
49b4da39 100Index: src/mod_extforward.c
94d9baaf 101===================================================================
49b4da39
ER		 102--- src/mod_extforward.c (.../tags/lighttpd-1.4.19) (revision 2145)
103+++ src/mod_extforward.c (.../branches/lighttpd-1.4.x) (revision 2145)
104@@ -281,8 +281,9 @@
105 static const char *last_not_in_array(array *a, plugin_data *p)
106 {
107 array *forwarder = p->conf.forwarder;
108+ int i;
a34aaa25 109
49b4da39
ER		 110- for (int i = a->used - 1; i >= 0; i--) {
111+ for (i = a->used - 1; i >= 0; i--) {
112 data_string *ds = (data_string *)a->data[i];
113 const char *ip = ds->value->ptr;
94d9baaf 114
a34aaa25
ER		 115Index: src/network_openssl.c
116===================================================================
49b4da39
ER		 117--- src/network_openssl.c (.../tags/lighttpd-1.4.19) (revision 2145)
118+++ src/network_openssl.c (.../branches/lighttpd-1.4.x) (revision 2145)
119@@ -85,6 +85,7 @@
120 *
121 */
a34aaa25 122
49b4da39
ER		 123+ ERR_clear_error();
124 if ((r = SSL_write(ssl, offset, toSend)) <= 0) {
125 unsigned long err;
36650255 126
49b4da39 127@@ -187,6 +188,7 @@
36650255 128
49b4da39 129 close(ifd);
36650255 130
49b4da39
ER		 131+ ERR_clear_error();
132 if ((r = SSL_write(ssl, s, toSend)) <= 0) {
133 unsigned long err;
36650255 134
a34aaa25
ER		 135Index: src/mod_compress.c
136===================================================================
49b4da39
ER		 137--- src/mod_compress.c (.../tags/lighttpd-1.4.19) (revision 2145)
138+++ src/mod_compress.c (.../branches/lighttpd-1.4.x) (revision 2145)
139@@ -178,9 +178,9 @@
a34aaa25
ER		 140 }
141
142 if (!buffer_is_empty(s->compress_cache_dir)) {
49b4da39
ER		 143+ struct stat st;
144 mkdir_recursive(s->compress_cache_dir->ptr);
145
146- struct stat st;
a34aaa25
ER		 147 if (0 != stat(s->compress_cache_dir->ptr, &st)) {
148 log_error_write(srv, __FILE__, __LINE__, "sbs", "can't stat compress.cache-dir",
49b4da39 149 s->compress_cache_dir, strerror(errno));
1e1cc0d1
ER		 150Index: src/mod_fastcgi.c
151===================================================================
49b4da39
ER		 152--- src/mod_fastcgi.c (.../tags/lighttpd-1.4.19) (revision 2145)
153+++ src/mod_fastcgi.c (.../branches/lighttpd-1.4.x) (revision 2145)
154@@ -2544,7 +2544,10 @@
1e1cc0d1
ER		 155 stat_cache_entry *sce;
156
157 if (HANDLER_ERROR != stat_cache_get_entry(srv, con, ds->value, &sce)) {
49b4da39
ER		 158- data_string *dcls = data_string_init();
159+ data_string *dcls;
160+ if (NULL == (dcls = (data_string *)array_get_unused_element(con->response.headers, TYPE_STRING))) {
161+ dcls = data_response_init();
162+ }
1e1cc0d1 163 /* found */
1e1cc0d1
ER		 164 http_chunk_append_file(srv, con, ds->value, 0, sce->st.st_size);
165 hctx->send_content_body = 0; /* ignore the content */
49b4da39
ER		 166Index: src/mod_magnet.c
167===================================================================
168--- src/mod_magnet.c (.../tags/lighttpd-1.4.19) (revision 2145)
169+++ src/mod_magnet.c (.../branches/lighttpd-1.4.x) (revision 2145)
170@@ -414,10 +414,16 @@
171 case MAGNET_ENV_URI_AUTHORITY: dest = con->uri.authority; break;
172 case MAGNET_ENV_URI_QUERY: dest = con->uri.query; break;
173
174- case MAGNET_ENV_REQUEST_METHOD: break;
175+ case MAGNET_ENV_REQUEST_METHOD:
176+ buffer_copy_string(srv->tmp_buf, get_http_method_name(con->request.http_method));
177+ dest = srv->tmp_buf;
178+ break;
179 case MAGNET_ENV_REQUEST_URI: dest = con->request.uri; break;
180 case MAGNET_ENV_REQUEST_ORIG_URI: dest = con->request.orig_uri; break;
181- case MAGNET_ENV_REQUEST_PROTOCOL: break;
182+ case MAGNET_ENV_REQUEST_PROTOCOL:
183+ buffer_copy_string(srv->tmp_buf, get_http_version_name(con->request.http_version));
184+ dest = srv->tmp_buf;
185+ break;
a34aaa25 186
49b4da39 187 case MAGNET_ENV_UNSET: break;
a34aaa25 188 }
49b4da39 189Index: doc/userdir.txt
a34aaa25 190===================================================================
49b4da39
ER		 191--- doc/userdir.txt (.../tags/lighttpd-1.4.19) (revision 2145)
192+++ doc/userdir.txt (.../branches/lighttpd-1.4.x) (revision 2145)
193@@ -46,10 +46,10 @@
194 Options
195 =======
a34aaa25 196
49b4da39
ER		 197-userdir.path
198+userdir.path (required option)
199 usually it should be set to "public_html" to take ~/public_html/ as the document root
a34aaa25 200
49b4da39
ER		 201- Default: empty (document root is the home directory)
202+ Default: unset (mod_userdir disabled; set it to "" if you want the home directory to be the document root as it was the default before 1.4.19)
203 Example: ::
09cf44bb 204
49b4da39 205 userdir.path = "public_html"
1e1cc0d1
ER		 206Index: SConstruct
207===================================================================
49b4da39
ER		 208--- SConstruct (.../tags/lighttpd-1.4.19) (revision 2145)
209+++ SConstruct (.../branches/lighttpd-1.4.x) (revision 2145)
210@@ -5,7 +5,7 @@
211 from stat import *
212
213 package = 'lighttpd'
214-version = '1.4.19'
215+version = '1.4.20'
10dbb8f0 216
49b4da39
ER		 217 def checkCHeaders(autoconf, hdrs):
218 p = re.compile('[^A-Z0-9]')
cc1350fa
ER		 219Index: NEWS
220===================================================================
49b4da39
ER		 221--- NEWS (.../tags/lighttpd-1.4.19) (revision 2145)
222+++ NEWS (.../branches/lighttpd-1.4.x) (revision 2145)
223@@ -3,8 +3,19 @@
cc1350fa
ER		 224 NEWS
225 ====
226
49b4da39
ER		 227-- 1.4.19 -
228+- 1.4.20 -
229
230+ * Fix mod_compress to compile with old gcc version (#1592)
231+ * Fix mod_extforward to compile with old gcc version (#1591)
232+ * Update documentation for #1587
233+ * Fix #285 again: read error after SSL_shutdown (thx marton.illes@balabit.com) and clear the error queue before some other calls (CVE-2008-1531)
234+ * Fix mod_magnet: enable "request.method" and "request.protocol" in lighty.env (#1308)
235+ * Fix segfault for appending matched parts if there was no regex matching (just give empty strings) (#1601)
236+ * Use data_response_init in mod_fastcgi x-sendfile handling for response.headers, fix a small "memleak" (#1628)
237+ * Don't send empty Server headers (#1620)
09cf44bb 238+
49b4da39 239+- 1.4.19 - 2008-03-10
cc1350fa 240+
49b4da39
ER		 241 * added support for If-Range: <date> (#1346)
242 * added support for matching $HTTP["scheme"] in configs
243 * fixed initgroups() called after chroot (#1384)
a34aaa25
ER		 244
245Property changes on: .
246___________________________________________________________________
247Name: svk:merge
49b4da39
ER		 248 - 152afb58-edef-0310-8abb-c4023f1b3aa9:/branches/lighttpd-1.3.x:499
249152afb58-edef-0310-8abb-c4023f1b3aa9:/branches/lighttpd-1.4.11-ssl-fixes:1346
250152afb58-edef-0310-8abb-c4023f1b3aa9:/branches/lighttpd-merge-1.4.x:1041
251152afb58-edef-0310-8abb-c4023f1b3aa9:/tags/lighttpd-1.4.11:1042
252152afb58-edef-0310-8abb-c4023f1b3aa9:/tags/release-1.3.13:105
253152afb58-edef-0310-8abb-c4023f1b3aa9:/trunk:104
254a98e19e4-a712-0410-8832-6551a15ffc53:/local/branches/lighttpd-1.4.x:1557
255ebd0e9cf-3e47-4385-9dd4-f0e25e97baa2:/local/lighttpd/branches/lighttpd-1.4.x:2164
a34aaa25
ER		 256 + 152afb58-edef-0310-8abb-c4023f1b3aa9:/branches/lighttpd-1.3.x:499
257152afb58-edef-0310-8abb-c4023f1b3aa9:/branches/lighttpd-1.4.11-ssl-fixes:1346
258152afb58-edef-0310-8abb-c4023f1b3aa9:/branches/lighttpd-merge-1.4.x:1041
259152afb58-edef-0310-8abb-c4023f1b3aa9:/tags/lighttpd-1.4.11:1042
260152afb58-edef-0310-8abb-c4023f1b3aa9:/tags/release-1.3.13:105
261152afb58-edef-0310-8abb-c4023f1b3aa9:/trunk:104
262a98e19e4-a712-0410-8832-6551a15ffc53:/local/branches/lighttpd-1.4.x:1557
49b4da39 263ebd0e9cf-3e47-4385-9dd4-f0e25e97baa2:/local/lighttpd/branches/lighttpd-1.4.x:2209
a34aaa25 264
Fast and light HTTP server
This page took 0.086557 seconds and 4 git commands to generate.