1
Description: Upstream changes introduced in version 1.4.28-1
2
This patch has been created by dpkg-source during the package build.
3
Here's the last changelog entry, hopefully it gives details on why
4
those changes were made:
6
lighttpd (1.4.28-1) unstable; urgency=low
9
* New upstream release (closes: 521235, 572031, 564556)
10
* Add check_syntax() from Ubuntu (closes: 589200)
12
The person named in the Author field signed this changelog entry.
13
Author: Thijs Kinkhorst <thijs@debian.org>
14
Bug-Debian: http://bugs.debian.org/521235
15
Bug-Debian: http://bugs.debian.org/564556
16
Bug-Debian: http://bugs.debian.org/572031
17
Bug-Debian: http://bugs.debian.org/589200
20
The information above should follow the Patch Tagging Guidelines, please
21
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
22
are templates for supplementary fields that you might want to add:
24
Origin: <vendor|upstream|other>, <url of original patch>
25
Bug: <url in upstream bugtracker>
26
Bug-Debian: http://bugs.debian.org/<bugnumber>
27
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
28
Forwarded: <no|not-needed|url proving that it has been forwarded>
29
Reviewed-By: <name and email of someone who approved the patch>
30
Last-Update: <YYYY-MM-DD>
32
--- lighttpd-1.4.28.orig/src/configparser.c
33
+++ lighttpd-1.4.28/src/configparser.c
35
/* First off, code is include which follows the "include" declaration
36
** in the input file. */
38
-#line 5 "../../src/configparser.y"
39
+#line 5 "./configparser.y"
41
#include "configfile.h"
43
@@ -518,42 +518,42 @@ static void yy_destructor(YYCODETYPE yym
47
-#line 144 "../../src/configparser.y"
48
+#line 144 "./configparser.y"
49
{ buffer_free((yypminor->yy0)); }
50
#line 523 "configparser.c"
53
-#line 135 "../../src/configparser.y"
54
+#line 135 "./configparser.y"
55
{ (yypminor->yy41)->free((yypminor->yy41)); }
56
#line 528 "configparser.c"
59
-#line 136 "../../src/configparser.y"
60
+#line 136 "./configparser.y"
61
{ (yypminor->yy41)->free((yypminor->yy41)); }
62
#line 533 "configparser.c"
65
-#line 137 "../../src/configparser.y"
66
+#line 137 "./configparser.y"
67
{ (yypminor->yy41)->free((yypminor->yy41)); }
68
#line 538 "configparser.c"
71
-#line 138 "../../src/configparser.y"
72
+#line 138 "./configparser.y"
73
{ array_free((yypminor->yy40)); }
74
#line 543 "configparser.c"
77
-#line 139 "../../src/configparser.y"
78
+#line 139 "./configparser.y"
79
{ array_free((yypminor->yy40)); }
80
#line 548 "configparser.c"
83
-#line 140 "../../src/configparser.y"
84
+#line 140 "./configparser.y"
85
{ buffer_free((yypminor->yy43)); }
86
#line 553 "configparser.c"
89
-#line 141 "../../src/configparser.y"
90
+#line 141 "./configparser.y"
91
{ buffer_free((yypminor->yy43)); }
92
#line 558 "configparser.c"
94
@@ -823,7 +823,7 @@ static void yy_reduce(
95
/* No destructor defined for global */
98
-#line 117 "../../src/configparser.y"
99
+#line 117 "./configparser.y"
100
{ yymsp[-1].minor.yy78 = NULL; }
101
#line 828 "configparser.c"
102
yy_destructor(1,&yymsp[0].minor);
103
@@ -838,7 +838,7 @@ static void yy_reduce(
104
yy_destructor(1,&yymsp[0].minor);
107
-#line 146 "../../src/configparser.y"
108
+#line 146 "./configparser.y"
111
buffer_copy_string_buffer(yymsp[0].minor.yy41->key, yymsp[-2].minor.yy43);
112
@@ -866,7 +866,7 @@ static void yy_reduce(
113
yy_destructor(2,&yymsp[-1].minor);
116
-#line 170 "../../src/configparser.y"
117
+#line 170 "./configparser.y"
119
array *vars = ctx->current->value;
121
@@ -909,7 +909,7 @@ static void yy_reduce(
122
yy_destructor(3,&yymsp[-1].minor);
125
-#line 209 "../../src/configparser.y"
126
+#line 209 "./configparser.y"
128
if (strchr(yymsp[0].minor.yy0->ptr, '.') == NULL) {
129
yygotominor.yy43 = buffer_init_string("var.");
130
@@ -924,7 +924,7 @@ static void yy_reduce(
131
#line 924 "configparser.c"
134
-#line 221 "../../src/configparser.y"
135
+#line 221 "./configparser.y"
137
yygotominor.yy41 = configparser_merge_data(yymsp[-2].minor.yy41, yymsp[0].minor.yy41);
138
if (NULL == yygotominor.yy41) {
139
@@ -938,7 +938,7 @@ static void yy_reduce(
140
yy_destructor(5,&yymsp[-1].minor);
143
-#line 231 "../../src/configparser.y"
144
+#line 231 "./configparser.y"
146
yygotominor.yy41 = yymsp[0].minor.yy41;
147
yymsp[0].minor.yy41 = NULL;
148
@@ -946,7 +946,7 @@ static void yy_reduce(
149
#line 946 "configparser.c"
152
-#line 236 "../../src/configparser.y"
153
+#line 236 "./configparser.y"
155
yygotominor.yy41 = NULL;
156
if (strncmp(yymsp[0].minor.yy43->ptr, "env.", sizeof("env.") - 1) == 0) {
157
@@ -976,7 +976,7 @@ static void yy_reduce(
158
#line 976 "configparser.c"
161
-#line 263 "../../src/configparser.y"
162
+#line 263 "./configparser.y"
164
yygotominor.yy41 = (data_unset *)data_string_init();
165
buffer_copy_string_buffer(((data_string *)(yygotominor.yy41))->value, yymsp[0].minor.yy0);
166
@@ -986,7 +986,7 @@ static void yy_reduce(
167
#line 986 "configparser.c"
170
-#line 270 "../../src/configparser.y"
171
+#line 270 "./configparser.y"
173
yygotominor.yy41 = (data_unset *)data_integer_init();
174
((data_integer *)(yygotominor.yy41))->value = strtol(yymsp[0].minor.yy0->ptr, NULL, 10);
175
@@ -996,7 +996,7 @@ static void yy_reduce(
176
#line 996 "configparser.c"
179
-#line 276 "../../src/configparser.y"
180
+#line 276 "./configparser.y"
182
yygotominor.yy41 = (data_unset *)data_array_init();
183
array_free(((data_array *)(yygotominor.yy41))->value);
184
@@ -1006,7 +1006,7 @@ static void yy_reduce(
185
#line 1006 "configparser.c"
188
-#line 282 "../../src/configparser.y"
189
+#line 282 "./configparser.y"
191
yygotominor.yy40 = array_init();
193
@@ -1015,7 +1015,7 @@ static void yy_reduce(
194
yy_destructor(9,&yymsp[0].minor);
197
-#line 285 "../../src/configparser.y"
198
+#line 285 "./configparser.y"
200
yygotominor.yy40 = yymsp[-1].minor.yy40;
201
yymsp[-1].minor.yy40 = NULL;
202
@@ -1025,7 +1025,7 @@ static void yy_reduce(
203
yy_destructor(9,&yymsp[0].minor);
206
-#line 290 "../../src/configparser.y"
207
+#line 290 "./configparser.y"
209
if (buffer_is_empty(yymsp[0].minor.yy41->key) ||
210
NULL == array_get_element(yymsp[-2].minor.yy40, yymsp[0].minor.yy41->key->ptr)) {
211
@@ -1046,7 +1046,7 @@ static void yy_reduce(
212
yy_destructor(10,&yymsp[-1].minor);
215
-#line 307 "../../src/configparser.y"
216
+#line 307 "./configparser.y"
218
yygotominor.yy40 = yymsp[-1].minor.yy40;
219
yymsp[-1].minor.yy40 = NULL;
220
@@ -1055,7 +1055,7 @@ static void yy_reduce(
221
yy_destructor(10,&yymsp[0].minor);
224
-#line 312 "../../src/configparser.y"
225
+#line 312 "./configparser.y"
227
yygotominor.yy40 = array_init();
228
array_insert_unique(yygotominor.yy40, yymsp[0].minor.yy41);
229
@@ -1064,7 +1064,7 @@ static void yy_reduce(
230
#line 1064 "configparser.c"
233
-#line 318 "../../src/configparser.y"
234
+#line 318 "./configparser.y"
236
yygotominor.yy41 = yymsp[0].minor.yy41;
237
yymsp[0].minor.yy41 = NULL;
238
@@ -1072,7 +1072,7 @@ static void yy_reduce(
239
#line 1072 "configparser.c"
242
-#line 322 "../../src/configparser.y"
243
+#line 322 "./configparser.y"
245
buffer_copy_string_buffer(yymsp[0].minor.yy41->key, yymsp[-2].minor.yy43);
246
buffer_free(yymsp[-2].minor.yy43);
247
@@ -1090,7 +1090,7 @@ static void yy_reduce(
251
-#line 334 "../../src/configparser.y"
252
+#line 334 "./configparser.y"
255
dc = (data_config *)array_get_element(ctx->srv->config_context, "global");
256
@@ -1101,7 +1101,7 @@ static void yy_reduce(
257
yy_destructor(12,&yymsp[0].minor);
260
-#line 341 "../../src/configparser.y"
261
+#line 341 "./configparser.y"
265
@@ -1119,7 +1119,7 @@ static void yy_reduce(
266
yy_destructor(14,&yymsp[0].minor);
269
-#line 352 "../../src/configparser.y"
270
+#line 352 "./configparser.y"
272
if (yymsp[-3].minor.yy78->context_ndx >= yymsp[0].minor.yy78->context_ndx) {
273
fprintf(stderr, "unreachable else condition\n");
274
@@ -1136,7 +1136,7 @@ static void yy_reduce(
275
yy_destructor(15,&yymsp[-1].minor);
278
-#line 364 "../../src/configparser.y"
279
+#line 364 "./configparser.y"
281
yygotominor.yy78 = yymsp[0].minor.yy78;
282
yymsp[0].minor.yy78 = NULL;
283
@@ -1144,7 +1144,7 @@ static void yy_reduce(
284
#line 1144 "configparser.c"
287
-#line 369 "../../src/configparser.y"
288
+#line 369 "./configparser.y"
292
@@ -1162,7 +1162,7 @@ static void yy_reduce(
293
yy_destructor(14,&yymsp[0].minor);
296
-#line 380 "../../src/configparser.y"
297
+#line 380 "./configparser.y"
300
buffer *b, *rvalue, *op;
301
@@ -1318,7 +1318,7 @@ static void yy_reduce(
302
yy_destructor(19,&yymsp[-2].minor);
305
-#line 529 "../../src/configparser.y"
306
+#line 529 "./configparser.y"
308
yygotominor.yy27 = CONFIG_COND_EQ;
310
@@ -1326,7 +1326,7 @@ static void yy_reduce(
311
yy_destructor(20,&yymsp[0].minor);
314
-#line 532 "../../src/configparser.y"
315
+#line 532 "./configparser.y"
317
yygotominor.yy27 = CONFIG_COND_MATCH;
319
@@ -1334,7 +1334,7 @@ static void yy_reduce(
320
yy_destructor(21,&yymsp[0].minor);
323
-#line 535 "../../src/configparser.y"
324
+#line 535 "./configparser.y"
326
yygotominor.yy27 = CONFIG_COND_NE;
328
@@ -1342,7 +1342,7 @@ static void yy_reduce(
329
yy_destructor(22,&yymsp[0].minor);
332
-#line 538 "../../src/configparser.y"
333
+#line 538 "./configparser.y"
335
yygotominor.yy27 = CONFIG_COND_NOMATCH;
337
@@ -1350,7 +1350,7 @@ static void yy_reduce(
338
yy_destructor(23,&yymsp[0].minor);
341
-#line 542 "../../src/configparser.y"
342
+#line 542 "./configparser.y"
344
yygotominor.yy43 = NULL;
346
@@ -1370,7 +1370,7 @@ static void yy_reduce(
347
#line 1370 "configparser.c"
350
-#line 559 "../../src/configparser.y"
351
+#line 559 "./configparser.y"
354
if (0 != config_parse_file(ctx->srv, ctx, yymsp[0].minor.yy43->ptr)) {
355
@@ -1384,7 +1384,7 @@ static void yy_reduce(
356
yy_destructor(24,&yymsp[-1].minor);
359
-#line 569 "../../src/configparser.y"
360
+#line 569 "./configparser.y"
363
if (0 != config_parse_cmd(ctx->srv, ctx, yymsp[0].minor.yy43->ptr)) {
364
@@ -1424,7 +1424,7 @@ static void yy_parse_failed(
365
while( yypParser->yyidx>=0 ) yy_pop_parser_stack(yypParser);
366
/* Here code is inserted which will be executed whenever the
368
-#line 108 "../../src/configparser.y"
369
+#line 108 "./configparser.y"
373
--- lighttpd-1.4.28.orig/src/mod_ssi_exprparser.c
374
+++ lighttpd-1.4.28/src/mod_ssi_exprparser.c
376
/* First off, code is include which follows the "include" declaration
377
** in the input file. */
379
-#line 6 "../../src/mod_ssi_exprparser.y"
380
+#line 6 "./mod_ssi_exprparser.y"
382
#include "mod_ssi_expr.h"
384
@@ -347,7 +347,7 @@ static void yy_destructor(YYCODETYPE yym
388
-#line 22 "../../src/mod_ssi_exprparser.y"
389
+#line 22 "./mod_ssi_exprparser.y"
390
{ buffer_free((yypminor->yy0)); }
391
#line 352 "mod_ssi_exprparser.c"
393
@@ -578,7 +578,7 @@ static void yy_reduce(
397
-#line 29 "../../src/mod_ssi_exprparser.y"
398
+#line 29 "./mod_ssi_exprparser.y"
400
ctx->val.bo = ssi_val_tobool(yymsp[0].minor.yy29);
401
ctx->val.type = SSI_TYPE_BOOL;
402
@@ -588,7 +588,7 @@ static void yy_reduce(
403
#line 588 "mod_ssi_exprparser.c"
406
-#line 36 "../../src/mod_ssi_exprparser.y"
407
+#line 36 "./mod_ssi_exprparser.y"
411
@@ -617,14 +617,14 @@ static void yy_reduce(
412
#line 617 "mod_ssi_exprparser.c"
415
-#line 61 "../../src/mod_ssi_exprparser.y"
416
+#line 61 "./mod_ssi_exprparser.y"
418
yygotominor.yy29 = yymsp[0].minor.yy29;
420
#line 624 "mod_ssi_exprparser.c"
423
-#line 64 "../../src/mod_ssi_exprparser.y"
424
+#line 64 "./mod_ssi_exprparser.y"
428
@@ -639,7 +639,7 @@ static void yy_reduce(
429
yy_destructor(1,&yymsp[-1].minor);
432
-#line 75 "../../src/mod_ssi_exprparser.y"
433
+#line 75 "./mod_ssi_exprparser.y"
437
@@ -654,7 +654,7 @@ static void yy_reduce(
438
yy_destructor(2,&yymsp[-1].minor);
441
-#line 86 "../../src/mod_ssi_exprparser.y"
442
+#line 86 "./mod_ssi_exprparser.y"
446
@@ -668,7 +668,7 @@ static void yy_reduce(
447
yy_destructor(9,&yymsp[-1].minor);
450
-#line 95 "../../src/mod_ssi_exprparser.y"
451
+#line 95 "./mod_ssi_exprparser.y"
453
yygotominor.yy29 = yymsp[-1].minor.yy29;
455
@@ -677,7 +677,7 @@ static void yy_reduce(
456
yy_destructor(11,&yymsp[0].minor);
459
-#line 99 "../../src/mod_ssi_exprparser.y"
460
+#line 99 "./mod_ssi_exprparser.y"
462
yygotominor.yy29 = ssi_val_init();
463
yygotominor.yy29->str = yymsp[0].minor.yy19;
464
@@ -686,14 +686,14 @@ static void yy_reduce(
465
#line 686 "mod_ssi_exprparser.c"
468
-#line 105 "../../src/mod_ssi_exprparser.y"
469
+#line 105 "./mod_ssi_exprparser.y"
471
yygotominor.yy19 = yymsp[0].minor.yy0;
473
#line 693 "mod_ssi_exprparser.c"
476
-#line 109 "../../src/mod_ssi_exprparser.y"
477
+#line 109 "./mod_ssi_exprparser.y"
479
yygotominor.yy19 = yymsp[-1].minor.yy19;
480
buffer_append_string_buffer(yygotominor.yy19, yymsp[0].minor.yy0);
481
@@ -702,37 +702,37 @@ static void yy_reduce(
482
#line 702 "mod_ssi_exprparser.c"
485
-#line 115 "../../src/mod_ssi_exprparser.y"
486
+#line 115 "./mod_ssi_exprparser.y"
487
{ yygotominor.yy8 = SSI_COND_EQ; }
488
#line 707 "mod_ssi_exprparser.c"
489
yy_destructor(3,&yymsp[0].minor);
492
-#line 116 "../../src/mod_ssi_exprparser.y"
493
+#line 116 "./mod_ssi_exprparser.y"
494
{ yygotominor.yy8 = SSI_COND_NE; }
495
#line 713 "mod_ssi_exprparser.c"
496
yy_destructor(4,&yymsp[0].minor);
499
-#line 117 "../../src/mod_ssi_exprparser.y"
500
+#line 117 "./mod_ssi_exprparser.y"
501
{ yygotominor.yy8 = SSI_COND_LE; }
502
#line 719 "mod_ssi_exprparser.c"
503
yy_destructor(8,&yymsp[0].minor);
506
-#line 118 "../../src/mod_ssi_exprparser.y"
507
+#line 118 "./mod_ssi_exprparser.y"
508
{ yygotominor.yy8 = SSI_COND_GE; }
509
#line 725 "mod_ssi_exprparser.c"
510
yy_destructor(6,&yymsp[0].minor);
513
-#line 119 "../../src/mod_ssi_exprparser.y"
514
+#line 119 "./mod_ssi_exprparser.y"
515
{ yygotominor.yy8 = SSI_COND_LT; }
516
#line 731 "mod_ssi_exprparser.c"
517
yy_destructor(7,&yymsp[0].minor);
520
-#line 120 "../../src/mod_ssi_exprparser.y"
521
+#line 120 "./mod_ssi_exprparser.y"
522
{ yygotominor.yy8 = SSI_COND_GT; }
523
#line 737 "mod_ssi_exprparser.c"
524
yy_destructor(5,&yymsp[0].minor);
525
@@ -764,7 +764,7 @@ static void yy_parse_failed(
526
while( yypParser->yyidx>=0 ) yy_pop_parser_stack(yypParser);
527
/* Here code is inserted which will be executed whenever the
529
-#line 14 "../../src/mod_ssi_exprparser.y"
530
+#line 14 "./mod_ssi_exprparser.y"