Hi,
this diff updates mod_fastcgi to the latest (unofficial)
release/snapshot.
It fixes http-auth for php-fastcgi for example (phpMyAdmin with
http-auth anyone?). We're running with this in production for a few
months now without any issues.
Objections/oks?
Regards,
Simon
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/mod_fastcgi/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile 3 Jun 2009 00:48:51 -0000 1.8
+++ Makefile 16 Jun 2009 22:48:13 -0000
@@ -2,14 +2,17 @@
COMMENT= Apache FastCGI module
-DISTNAME= mod_fastcgi-2.4.2
-PKGNAME= ${DISTNAME}p4
+DISTNAME= mod_fastcgi-SNAP-0811090952
+# temporary workaround: as the original distname would prevent a seamless
+# update use the last offical version and append the date of the snapshot
+PKGNAME= mod_fastcgi-2.4.6.081109
CATEGORIES= www
HOMEPAGE= http://www.fastcgi.com/
-MASTER_SITES= ${HOMEPAGE}dist/old/
+MASTER_SITES= ${HOMEPAGE}dist/ \
+ ${HOMEPAGE}dist/old/
MODULES= apache-module
MODAPACHE_NAME= fastcgi
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/mod_fastcgi/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 5 Apr 2007 17:26:21 -0000 1.2
+++ distinfo 16 Jun 2009 22:48:13 -0000
@@ -1,5 +1,5 @@
-MD5 (mod_fastcgi-2.4.2.tar.gz) = 6ZRBQwS1NcuZ4Qt9HK0dHg==
-RMD160 (mod_fastcgi-2.4.2.tar.gz) = g8AVZ7uabTk0VXMTdAhhUmCXLh4=
-SHA1 (mod_fastcgi-2.4.2.tar.gz) = pWvmKj8IJirhh5ifXayzRkoDDi4=
-SHA256 (mod_fastcgi-2.4.2.tar.gz) =
hkhG+gJXQbrIgpDiBNuxflvlNJkMxschg0LtrFjRNhU=
-SIZE (mod_fastcgi-2.4.2.tar.gz) = 98295
+MD5 (mod_fastcgi-SNAP-0811090952.tar.gz) = uJqW+Owloqw4o5sbBfVJ/Q==
+RMD160 (mod_fastcgi-SNAP-0811090952.tar.gz) = c2WYd/vvCYB34AoN+yYuComoTEQ=
+SHA1 (mod_fastcgi-SNAP-0811090952.tar.gz) = rNJdP2wrENofrrIfKFumUZnsxOs=
+SHA256 (mod_fastcgi-SNAP-0811090952.tar.gz) =
B1nt4EVS9R9KK183NIAw6/ltgved1ujRTrOE9YZrYTA=
+SIZE (mod_fastcgi-SNAP-0811090952.tar.gz) = 101299
Index: patches/patch-fcgi_config_c
===================================================================
RCS file: patches/patch-fcgi_config_c
diff -N patches/patch-fcgi_config_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-fcgi_config_c 16 Jun 2009 22:48:13 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Cast like it's done in httpd sources.
+
+--- fcgi_config.c.orig Wed Jan 28 23:46:44 2009
++++ fcgi_config.c Wed Jan 28 23:54:56 2009
+@@ -1204,7 +1204,7 @@ const char *fcgi_config_new_auth_server(cmd_parms * cm
+ if (compat && strcasecmp(compat, "-compat"))
+ return ap_psprintf(cmd->temp_pool, "%s: unknown option: \"%s\"",
cmd->cmd->name, compat);
+
+- switch((int)cmd->info) {
++ switch((int)(long)cmd->info) {
+ case FCGI_AUTH_TYPE_AUTHENTICATOR:
+ dir_config->authenticator = auth_server;
+ dir_config->authenticator_options |= (compat) ? FCGI_COMPAT : 0;
Index: patches/patch-fcgi_pm_c
===================================================================
RCS file: /cvs/ports/www/mod_fastcgi/patches/patch-fcgi_pm_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-fcgi_pm_c
--- patches/patch-fcgi_pm_c 14 Feb 2005 06:23:23 -0000 1.1.1.1
+++ patches/patch-fcgi_pm_c 16 Jun 2009 22:48:13 -0000
@@ -1,6 +1,6 @@
---- fcgi_pm.c.orig Thu Oct 30 02:08:34 2003
-+++ fcgi_pm.c Mon Feb 14 06:57:49 2005
-@@ -26,7 +26,7 @@ time_t fcgi_dynamic_epoch = 0;
+--- fcgi_pm.c.orig Tue Sep 23 00:24:45 2008
++++ fcgi_pm.c Wed Jan 28 23:45:46 2009
+@@ -26,7 +26,7 @@ time_t fcgi_dynamic_epoch = 0; /* last time
* invoked by process mgr */
time_t fcgi_dynamic_last_analyzed = 0; /* last time calculation was
* made for the dynamic procs */
@@ -9,7 +9,7 @@
static time_t now = 0;
#ifdef WIN32
-@@ -1092,6 +1092,8 @@ static void dynamic_read_msgs(int read_r
+@@ -1102,6 +1102,8 @@ static void dynamic_read_msgs(int read_ready)
/* Create socket file's path */
s->socket_path = fcgi_util_socket_hash_filename(tp, execName,
user, group);
s->socket_path = fcgi_util_socket_make_path_absolute(sp,
s->socket_path, 1);
@@ -18,7 +18,7 @@
/* Create sockaddr, prealloc it so it won't get created in tp */
s->socket_addr = ap_pcalloc(sp, sizeof(struct sockaddr_un));
-@@ -1649,7 +1651,19 @@ void fcgi_pm_main(void *dummy)
+@@ -1665,7 +1667,19 @@ void fcgi_pm_main(void *dummy)
fcgi_config_set_env_var(fcgi_config_pool, dynamicEnvp, &i, "SystemRoot");
#else
Index: patches/patch-mod_fastcgi_c
===================================================================
RCS file: /cvs/ports/www/mod_fastcgi/patches/patch-mod_fastcgi_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-mod_fastcgi_c
--- patches/patch-mod_fastcgi_c 14 Feb 2005 06:23:23 -0000 1.1.1.1
+++ patches/patch-mod_fastcgi_c 16 Jun 2009 22:48:13 -0000
@@ -1,6 +1,6 @@
---- mod_fastcgi.c.orig Thu Oct 30 02:08:34 2003
-+++ mod_fastcgi.c Mon Feb 14 06:54:32 2005
-@@ -1074,7 +1074,8 @@ static int open_connection_to_fs(fcgi_re
+--- mod_fastcgi.c.orig Sun Nov 9 15:31:03 2008
++++ mod_fastcgi.c Wed Jan 28 23:45:46 2009
+@@ -1073,7 +1073,8 @@ static int open_connection_to_fs(fcgi_request *fr)
{
socket_path = fcgi_util_socket_hash_filename(rp, fr->fs_path,
fr->user, fr->group);
socket_path = fcgi_util_socket_make_path_absolute(rp, socket_path, 1);
