Attachment 15929 Details for Bug 49115

[patch] Proposed patch (diff between mod_python-2.7 patchlevel 8 and 10)

mod_python-2.7.8-2.7.10.dif (text/plain), 3.94 KB, created by Peter Poeml on 2004-02-10 20:29:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Poeml

Created: 2004-02-10 20:29:45 UTC

Size: 3.94 KB

patch

obsolete

>diff -uNr --exclude-from=mp.ignore mod_python-2.7.8/src/_apachemodule.c mod_python-2.7.10/src/_apachemodule.c
>--- mod_python-2.7.8/src/_apachemodule.c	2001-05-28 22:00:41.000000000 +0200
>+++ mod_python-2.7.10/src/_apachemodule.c	2003-12-08 05:36:10.000000000 +0100
>@@ -44,7 +44,7 @@
>  *
>  * _apachemodule.c 
>  *
>- * $Id: _apachemodule.c,v 1.9 2001/05/28 20:00:41 gtrubetskoy Exp $
>+ * $Id: _apachemodule.c,v 1.9.2.1 2003/12/08 04:36:10 grisha Exp $
>  *
>  */
> 
>@@ -150,11 +150,14 @@
> 	    i++;
> 	    j++;
> 	}
>-	_PyString_Resize(&pair, j);
>-	cpair = PyString_AS_STRING(pair);
> 
>-	PyList_Append(pairs, pair);
>-	Py_DECREF(pair);
>+        if (j) {
>+            _PyString_Resize(&pair, j);
>+            if (pair)
>+                PyList_Append(pairs, pair);
>+        }
>+
>+	Py_XDECREF(pair);
> 	i++;
>     }
> 
>@@ -218,26 +221,30 @@
> 	    ap_unescape_url(cval);
> 
> 	    _PyString_Resize(&key, strlen(ckey));
>-	    ckey = PyString_AS_STRING(key);
> 	    _PyString_Resize(&val, strlen(cval));
>-	    cval = PyString_AS_STRING(val);
>+            
>+            if (key && val) {
>+
>+                ckey = PyString_AS_STRING(key);
>+                cval = PyString_AS_STRING(val);
> 	
>-	    if (PyMapping_HasKeyString(dict, ckey)) {
>-		PyObject *list;
>-		list = PyDict_GetItem(dict, key);
>-		PyList_Append(list, val);
>-		/* PyDict_GetItem is a borrowed ref, no decref */
>-	    }
>-	    else {
>-		PyObject *list;
>-		list = Py_BuildValue("[O]", val);
>-		PyDict_SetItem(dict, key, list);
>-		Py_DECREF(list);
>-	    }
>+                if (PyMapping_HasKeyString(dict, ckey)) {
>+                    PyObject *list;
>+                    list = PyDict_GetItem(dict, key);
>+                    PyList_Append(list, val);
>+                    /* PyDict_GetItem is a borrowed ref, no decref */
>+                }
>+                else {
>+                    PyObject *list;
>+                    list = Py_BuildValue("[O]", val);
>+                    PyDict_SetItem(dict, key, list);
>+                    Py_DECREF(list);
>+                }
>+            }
> 	}
> 
>-	Py_DECREF(key);
>-	Py_DECREF(val);
>+	Py_XDECREF(key);
>+	Py_XDECREF(val);
> 
> 	n++;
>     }
>@@ -292,6 +299,13 @@
> 	    i++;
> 	    j++;
> 	}
>+
>+        if (j == 0) {
>+            Py_XDECREF(pair);
>+            i++;
>+            continue;
>+        }
>+
> 	cpair[j] = '\0';
> 	_PyString_Resize(&pair, j);
> 	cpair = PyString_AS_STRING(pair);
>@@ -337,12 +351,13 @@
> 	    _PyString_Resize(&key, strlen(ckey));
> 	    _PyString_Resize(&val, strlen(cval));
> 
>-	    PyList_Append(pairs, Py_BuildValue("(O,O)", key, val));
>+            if (key && val)
>+                PyList_Append(pairs, Py_BuildValue("(O,O)", key, val));
> 
> 	}
>-	Py_DECREF(pair);
>-	Py_DECREF(key);
>-	Py_DECREF(val);
>+	Py_XDECREF(pair);
>+	Py_XDECREF(key);
>+	Py_XDECREF(val);
> 	i++;
>     }
> 
>diff -uNr --exclude-from=mp.ignore mod_python-2.7.8/src/include/mod_python.h mod_python-2.7.10/src/include/mod_python.h
>--- mod_python-2.7.8/src/include/mod_python.h	2000-12-13 06:24:08.000000000 +0100
>+++ mod_python-2.7.10/src/include/mod_python.h	2003-12-08 05:36:10.000000000 +0100
>@@ -47,7 +47,7 @@
>  *
>  * mod_python.h 
>  *
>- * $Id: mod_python.h,v 1.13 2000/12/13 05:24:08 gtrubetskoy Exp $
>+ * $Id: mod_python.h,v 1.13.2.1 2003/12/08 04:36:10 grisha Exp $
>  *
>  * See accompanying documentation and source code comments 
>  * for details.
>@@ -117,6 +117,12 @@
> #define SLASH_S "/"
> #endif
> 
>+/* python 2.3 no longer defines LONG_LONG, it defines PY_LONG_LONG */
>+#ifndef LONG_LONG
>+#define LONG_LONG PY_LONG_LONG
>+#endif
>+
>+
> PyObject *Mp_ServerReturn;
> 
> /* structure to hold interpreter data */
>diff -uNr --exclude-from=mp.ignore mod_python-2.7.8/src/include/mpversion.h mod_python-2.7.10/src/include/mpversion.h
>--- mod_python-2.7.8/src/include/mpversion.h	2002-04-19 20:21:24.000000000 +0200
>+++ mod_python-2.7.10/src/include/mpversion.h	2003-12-08 05:36:10.000000000 +0100
>@@ -1,6 +1,6 @@
> #define MPV_MAJOR 2
> #define MPV_MINOR 7
>-#define MPV_PATCH 8
>+#define MPV_PATCH 10
> #define MPV_BUILD 0
> 
>-#define MPV_STRING "2.7.8"
>+#define MPV_STRING "2.7.10"

Actions: View | Diff

Attachments on bug 49115: 15735 | 15736 | 15929