The branch, master has been updated via 05706e1 s4:web_server/*.c - optimise includes via 978a14d s4:web_server/wsgi.c - fix a counter type via f05ddcf s4:web_server/wsgi.c - add missing Python compatibility code from 136a5d7 s4:kdc/*.c - minimise includes
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 05706e1801d2e86810157e667e0c480546496752 Author: Matthias Dieter Wallnöfer <m...@samba.org> Date: Sun Dec 12 17:36:16 2010 +0100 s4:web_server/*.c - optimise includes Autobuild-User: Matthias Dieter Wallnöfer <m...@samba.org> Autobuild-Date: Sun Dec 12 18:23:05 CET 2010 on sn-devel-104 commit 978a14d40c4ccafa493753bd3dc3efe8269a5cad Author: Matthias Dieter Wallnöfer <m...@samba.org> Date: Sun Dec 12 17:27:36 2010 +0100 s4:web_server/wsgi.c - fix a counter type commit f05ddcfbe658834c3ac8054eea5fa6d0bc66d2b6 Author: Matthias Dieter Wallnöfer <m...@samba.org> Date: Sun Dec 12 17:27:09 2010 +0100 s4:web_server/wsgi.c - add missing Python compatibility code ----------------------------------------------------------------------- Summary of changes: source4/web_server/web_server.c | 9 ++------- source4/web_server/wsgi.c | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 9 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/web_server/web_server.c b/source4/web_server/web_server.c index 4cc2cb8..9531115 100644 --- a/source4/web_server/web_server.c +++ b/source4/web_server/web_server.c @@ -21,16 +21,11 @@ */ #include "includes.h" -#include "smbd/service_task.h" -#include "smbd/service_stream.h" -#include "smbd/service.h" #include "web_server/web_server.h" +#include "../lib/util/dlinklist.h" +#include "lib/tls/tls.h" #include "lib/events/events.h" -#include "system/filesys.h" -#include "system/network.h" #include "lib/socket/netif.h" -#include "lib/tls/tls.h" -#include "../lib/util/dlinklist.h" #include "param/param.h" /* don't allow connections to hang around forever */ diff --git a/source4/web_server/wsgi.c b/source4/web_server/wsgi.c index e1e2118..03e1285 100644 --- a/source4/web_server/wsgi.c +++ b/source4/web_server/wsgi.c @@ -24,10 +24,20 @@ #include "includes.h" #include "web_server/web_server.h" #include "../lib/util/dlinklist.h" -#include "../lib/util/data_blob.h" #include "lib/tls/tls.h" #include "lib/tsocket/tsocket.h" +/* There's no Py_ssize_t in 2.4, apparently */ +#if PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION < 5 +typedef int Py_ssize_t; +typedef inquiry lenfunc; +typedef intargfunc ssizeargfunc; +#endif + +#ifndef Py_RETURN_NONE +#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None +#endif + typedef struct { PyObject_HEAD struct websrv_context *web; @@ -37,7 +47,7 @@ static PyObject *start_response(PyObject *self, PyObject *args, PyObject *kwargs { PyObject *response_header, *exc_info = NULL; char *status; - int i; + Py_ssize_t i; const char *kwnames[] = { "status", "response_header", "exc_info", NULL }; -- Samba Shared Repository