Attachment #136741 for bug #182030

View | Details | Raw Unified | Return to bug 182030
Collapse All | Expand All

Lines 2-7 Link Here

(-)Makefile (-1 / +1 lines)
2		2
3	PORTNAME= mod_wsgi	3	PORTNAME= mod_wsgi
4	PORTVERSION= 3.4	4	PORTVERSION= 3.4
		5	PORTREVISION= 1
5	CATEGORIES= www python	6	CATEGORIES= www python
6	MASTER_SITES= GOOGLE_CODE	7	MASTER_SITES= GOOGLE_CODE
7	PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX}	8	PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX}
Lines 11-17 Link Here
11		12
12	LICENSE= AL2	13	LICENSE= AL2
13		14
14
15	#LATEST_LINK= mod_wsgi	15	#LATEST_LINK= mod_wsgi
16	CONFLICTS= ${PKGNAMEPREFIX}mod_wsgi-2.* mod_wsgi-2.*	16	CONFLICTS= ${PKGNAMEPREFIX}mod_wsgi-2.* mod_wsgi-2.*
17		17




--- 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));
 

Return to bug 182030

Line 0 Link Here

(-)files/patch-mod__wsgi.c (+16 lines)
	1	--- mod_wsgi.c.orig 2012-08-22 23:10:44.000000000 -0400
	2	+++ mod_wsgi.c 2013-09-12 06:29:36.718830524 -0400
	3	@@ -10600,7 +10600,13 @@
	4	* will add their own input/output filters to the chain.
	5	*/
	6
	7	+#if AP_MODULE_MAGIC_AT_LEAST(20110619,0)
	8	+ /* For 2.4 a NULL sbh pointer should work. */
	9	+ sbh = NULL;
	10	+#else
	11	+ /* For 2.2 a dummy sbh pointer is needed. */
	12	ap_create_sb_handle(&sbh, p, -1, 0);
	13	+#endif
	14
	15	c = (conn_rec *)apr_pcalloc(p, sizeof(conn_rec));
	16