Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (eb2e770440abec2f61ba2666d65dce05fe9bd230)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (eb2e770440abec2f61ba2666d65dce05fe9bd230)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (eb2e770440abec2f61ba2666d65dce05fe9bd230)
  • Date: Mon, 29 Sep 2008 22:58:42 -0500
GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

http/lighttpd/DETAILS | 7 +---
http/lighttpd/HISTORY | 5 ++
http/lighttpd/PRE_BUILD | 6 ---
http/lighttpd/memory.leak.patch | 68
----------------------------------------
http/lighttpd/mod_fastcgi.patch | 56 --------------------------------
http/lighttpd/mod_scgi.patch | 53 -------------------------------
6 files changed, 8 insertions(+), 187 deletions(-)

New commits:
commit eb2e770440abec2f61ba2666d65dce05fe9bd230
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

lighttpd: => 1.4.20

diff --git a/http/lighttpd/DETAILS b/http/lighttpd/DETAILS
index 7c7cda9..1606b0b 100755
--- a/http/lighttpd/DETAILS
+++ b/http/lighttpd/DETAILS
@@ -1,14 +1,13 @@
SPELL=lighttpd
- VERSION=1.4.19
-
SOURCE_HASH=sha512:022f8773c67110d352f9144ece7f42904cec0c0ca2559def3ecc5ddee3ec0d842c9f754f6e24f73ec5a240602da35203625c34586409209e0e1418d6941c0ac0
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=1.4.20
+
SOURCE_HASH=sha512:a2fdb4c4e0c949265b90399577529e01da51b10fdf9bd1b7f7d88f60e08887fe72e7249a4be2f21531733bb871dfd0e3d934bf07ef72bc59a4d5d0737520ba6a
+ SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://www.lighttpd.net/download/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.lighttpd.net/
LICENSE[0]=BSD
ENTERED=20050722
SECURITY_PATCH=5
- PATCHLEVEL=2
KEYWORDS="http"
SHORT="light httpd"
cat << EOF
diff --git a/http/lighttpd/HISTORY b/http/lighttpd/HISTORY
index 85547cd..e3c5ee0 100644
--- a/http/lighttpd/HISTORY
+++ b/http/lighttpd/HISTORY
@@ -1,3 +1,8 @@
+2008-09-30 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.4.20; switched to bzipped2 tarball
+ * PRE_BUILD: removed, everything's fixed by upstream
+ * memory.leak.patch, mod_fastcgi.patch, mod_scgi.patch: removed
+
2008-09-29 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: SECURITY_PATCH+=1 (http://secunia.com/advisories/32069/);
quoting paths
diff --git a/http/lighttpd/PRE_BUILD b/http/lighttpd/PRE_BUILD
deleted file mode 100755
index db47e35..0000000
--- a/http/lighttpd/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-patch -p0 < "$SPELL_DIRECTORY/memory.leak.patch" &&
-patch -p0 < "$SPELL_DIRECTORY/mod_scgi.patch" &&
-patch -p0 < "$SPELL_DIRECTORY/mod_fastcgi.patch"
diff --git a/http/lighttpd/memory.leak.patch b/http/lighttpd/memory.leak.patch
deleted file mode 100644
index 138096a..0000000
--- a/http/lighttpd/memory.leak.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- src/request.c.orig 2008-09-20 19:53:44.000000000 +0800
-+++ src/request.c 2008-09-20 20:03:14.000000000 +0800
-@@ -825,6 +825,7 @@
-
"request-header:\n",
-
con->request.request);
- }
-+
ds->free((data_unset*)ds);
-
return 0;
- }
-
-@@ -839,7 +840,7 @@
-
con->http_status = 400;
-
con->keep_alive = 0;
-
--
array_insert_unique(con->request.headers, (data_unset *)ds);
-+
ds->free((data_unset*)ds);
-
return 0;
- }
- }
-@@ -856,7 +857,7 @@
-
con->http_status = 400;
-
con->keep_alive = 0;
-
--
array_insert_unique(con->request.headers, (data_unset *)ds);
-+
ds->free((data_unset*)ds);
-
return 0;
- }
- } else if (cmp > 0 &&
0 == (cmp = buffer_caseless_compare(CONST_BUF_LEN(ds->key),
CONST_STR_LEN("Content-Type")))) {
-@@ -874,6 +875,7 @@
-
"request-header:\n",
-
con->request.request);
- }
-+
ds->free((data_unset*)ds);
-
return 0;
- }
- } else if (cmp > 0 &&
0 == (cmp = buffer_caseless_compare(CONST_BUF_LEN(ds->key),
CONST_STR_LEN("Expect")))) {
-@@ -911,6 +913,7 @@
-
"request-header:\n",
-
con->request.request);
- }
-+
ds->free((data_unset*)ds);
-
return 0;
- }
- } else if (cmp > 0 &&
0 == (cmp = buffer_caseless_compare(CONST_BUF_LEN(ds->key),
CONST_STR_LEN("If-Modified-Since")))) {
-@@ -936,6 +939,7 @@
-
"request-header:\n",
-
con->request.request);
- }
-+
ds->free((data_unset*)ds);
-
return 0;
- }
- } else if (cmp > 0 &&
0 == (cmp = buffer_caseless_compare(CONST_BUF_LEN(ds->key),
CONST_STR_LEN("If-None-Match")))) {
-@@ -953,6 +957,7 @@
-
"request-header:\n",
-
con->request.request);
- }
-+
ds->free((data_unset*)ds);
-
return 0;
- }
- } else if (cmp > 0 &&
0 == (cmp = buffer_caseless_compare(CONST_BUF_LEN(ds->key),
CONST_STR_LEN("Range")))) {
-@@ -976,6 +981,7 @@
-
"request-header:\n",
-
con->request.request);
- }
-+
ds->free((data_unset*)ds);
-
return 0;
- }
- }
diff --git a/http/lighttpd/mod_fastcgi.patch b/http/lighttpd/mod_fastcgi.patch
deleted file mode 100644
index 9fa2bd2..0000000
--- a/http/lighttpd/mod_fastcgi.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- src/mod_fastcgi.c.orig
-+++ src/mod_fastcgi.c
-@@ -235,4 +235,14 @@
-
- unsigned short break_scriptfilename_for_php;
-+
-+ /*
-+ * workaround for program when prefix="/"
-+ *
-+ * rule to build PATH_INFO is hardcoded for when check_local is
disabled
-+ * enable this option to use the workaround
-+ *
-+ */
-+
-+ unsigned short fix_root_path_name;
-
- /*
-@@ -1196,4 +1206,5 @@
- { "strip-request-uri", NULL,
T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION }, /* 16 */
- { "kill-signal", NULL,
T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION }, /* 17 */
-+ { "fix-root-scriptname",
NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 18 */
-
- { NULL, NULL,
T_CONFIG_UNSET, T_CONFIG_SCOPE_UNSET }
-@@ -1223,4 +1234,5 @@
- host->allow_xsendfile = 0; /* handle
X-LIGHTTPD-send-file */
- host->kill_signal = SIGTERM;
-+ host->fix_root_path_name = 0;
-
- fcv[0].destination = host->host;
-@@ -1244,4 +1256,5 @@
- fcv[16].destination =
host->strip_request_uri;
- fcv[17].destination =
&(host->kill_signal);
-+ fcv[18].destination =
&(host->fix_root_path_name);
-
- if (0 !=
config_insert_values_internal(srv, da_host->value, fcv)) {
-@@ -3586,4 +3599,11 @@
- * PATH_INFO = /bar
- *
-+ * if prefix = /, and fix-root-path-name is enable
-+ *
-+ * /fcgi-bin/foo/bar
-+ *
-+ * SCRIPT_NAME = /fcgi-bin/foo
-+ * PATH_INFO = /bar
-+ *
- */
-
-@@ -3597,4 +3617,8 @@
-
- con->uri.path->used -=
con->request.pathinfo->used - 1;
-+ con->uri.path->ptr[con->uri.path->used - 1] =
'\0';
-+ } else if (host->fix_root_path_name &&
extension->key->ptr[0] == '/' && extension->key->ptr[1] == '\0') {
-+ buffer_copy_string(con->request.pathinfo,
con->uri.path->ptr);
-+ con->uri.path->used = 1;
- con->uri.path->ptr[con->uri.path->used - 1] =
'\0';
- }
diff --git a/http/lighttpd/mod_scgi.patch b/http/lighttpd/mod_scgi.patch
deleted file mode 100644
index a6bb929..0000000
--- a/http/lighttpd/mod_scgi.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- src/mod_scgi.c.orig 2008-02-29 01:19:03.000000000 +0300
-+++ src/mod_scgi.c 2008-09-03 09:02:52.221731772 +0400
-@@ -202,6 +202,15 @@
- *
- */
-
-+ /*
-+ * workaround for program when prefix="/"
-+ *
-+ * rule to build PATH_INFO is hardcoded for when check_local is
disabled
-+ * enable this option to use the workaround
-+ *
-+ */
-+
-+ unsigned short fix_root_path_name;
- ssize_t load; /* replace by host->load */
-
- size_t max_id; /* corresponds most of the time to
-@@ -968,6 +977,7 @@
-
- { "bin-environment", NULL,
T_CONFIG_ARRAY, T_CONFIG_SCOPE_CONNECTION }, /* 11 */
- { "bin-copy-environment",
NULL, T_CONFIG_ARRAY, T_CONFIG_SCOPE_CONNECTION }, /* 12 */
-+ { "fix-root-scriptname",
NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 13 */
-
-
- { NULL, NULL,
T_CONFIG_UNSET, T_CONFIG_SCOPE_UNSET }
-@@ -990,6 +1000,7 @@
- df->max_load_per_proc = 1;
- df->idle_timeout = 60;
- df->disable_time = 60;
-+ df->fix_root_path_name = 0;
-
- fcv[0].destination = df->host;
- fcv[1].destination = df->docroot;
-@@ -1006,6 +1017,7 @@
-
- fcv[11].destination = df->bin_env;
- fcv[12].destination =
df->bin_env_copy;
-+ fcv[13].destination =
&(df->fix_root_path_name);
-
-
- if (0 !=
config_insert_values_internal(srv, da_host->value, fcv)) {
-@@ -2790,6 +2802,10 @@
-
- con->uri.path->used -=
con->request.pathinfo->used - 1;
-
con->uri.path->ptr[con->uri.path->used - 1] = '\0';
-+ } else if (host->fix_root_path_name &&
extension->key->ptr[0] == '/' && extension->key->ptr[1] == '\0') {
-+
buffer_copy_string(con->request.pathinfo, con->uri.path->ptr);
-+ con->uri.path->used = 1;
-+
con->uri.path->ptr[con->uri.path->used - 1] = '\0';
- }
- }
- return HANDLER_GO_ON;


  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (eb2e770440abec2f61ba2666d65dce05fe9bd230), Vlad Glagolev, 09/29/2008

Archive powered by MHonArc 2.6.24.

Top of Page