svn commit: r327109 - in head/www/mod_wsgi3: . files

[Olli Hauer]

Author: ohauer
Date: Thu Sep 12 20:21:31 2013
New Revision: 327109
URL: http://svnweb.freebsd.org/changeset/ports/327109

Log:
  - Scoreboard handle in daemon mode should be set to NULL
    for Apache 2.4 to avoid crash in lingering close.
  
  PR:		ports/182030
  Submitted by:	Trevor Caira <trevor at bitba.se>
  Reviewed by:	Douglas Thrift <douglas at douglasthrift.net> (maintainer)
  Obtained from:	upstream revision: 20979c8abd2f

Added:
  head/www/mod_wsgi3/files/patch-mod_wsgi.c   (contents, props changed)
Modified:
  head/www/mod_wsgi3/Makefile

Modified: head/www/mod_wsgi3/Makefile
==============================================================================
--- head/www/mod_wsgi3/Makefile	Thu Sep 12 20:18:06 2013	(r327108)
+++ head/www/mod_wsgi3/Makefile	Thu Sep 12 20:21:31 2013	(r327109)
@@ -2,6 +2,7 @@
 
 PORTNAME=	mod_wsgi
 PORTVERSION=	3.4
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	GOOGLE_CODE
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
@@ -11,7 +12,6 @@ COMMENT=	Python WSGI adapter module for 
 
 LICENSE=	AL2
 
-
 #LATEST_LINK=	mod_wsgi
 CONFLICTS=	${PKGNAMEPREFIX}mod_wsgi-2.* mod_wsgi-2.*
 

Added: head/www/mod_wsgi3/files/patch-mod_wsgi.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/mod_wsgi3/files/patch-mod_wsgi.c	Thu Sep 12 20:21:31 2013	(r327109)
@@ -0,0 +1,16 @@
+--- mod_wsgi.c.orig	2012-08-22 23:10:44.000000000 -0400
++++ mod_wsgi.c		2013-09-12 06:29:36.718830524 -0400
+@@ -10600,7 +10600,13 @@
+      * will add their own input/output filters to the chain.
+      */
+ 
++#if AP_MODULE_MAGIC_AT_LEAST(20110619,0)
++    /* For 2.4 a NULL sbh pointer should work. */
++    sbh = NULL;
++#else
++    /* For 2.2 a dummy sbh pointer is needed. */
+     ap_create_sb_handle(&sbh, p, -1, 0);
++#endif
+ 
+     c = (conn_rec *)apr_pcalloc(p, sizeof(conn_rec));
+