ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/pack/freebsd/diff/www/mod_wsgi/mod_wsgi.2008-07-15T221442Z.diff
Revision: 28
Committed: 2008-07-15T13:31:46-07:00 (16 years, 11 months ago) by douglas
Original Path: freebsd/www/mod_wsgi.patch
File size: 1025 byte(s)
Log Message:
Clean up fix from http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/125628.

File Contents

# User Rev Content
1 douglas 28 diff -Nrux .svn -x work /usr/ports/www/mod_wsgi/files/patch-mod_wsgi.c mod_wsgi/files/patch-mod_wsgi.c
2     --- /usr/ports/www/mod_wsgi/files/patch-mod_wsgi.c Wed Dec 31 16:00:00 1969
3     +++ mod_wsgi/files/patch-mod_wsgi.c Tue Jul 15 13:12:53 2008
4     @@ -0,0 +1,33 @@
5     +--- mod_wsgi.c.orig Tue Jul 15 13:01:00 2008
6     ++++ mod_wsgi.c Tue Jul 15 13:07:19 2008
7     +@@ -7749,10 +7749,12 @@
8     + {
9     + const char *display_name = NULL;
10     +
11     ++#ifndef __FreeBSD__
12     + int slen = 0;
13     + int dlen = 0;
14     +
15     + char *argv0 = NULL;
16     ++#endif
17     +
18     + display_name = daemon->group->display_name;
19     +
20     +@@ -7771,6 +7773,9 @@
21     + * is restricted, need to truncate display name if too long.
22     + */
23     +
24     ++#ifdef __FreeBSD__
25     ++ setproctitle("%s", display_name);
26     ++#else
27     + argv0 = (char*)wsgi_server->process->argv[0];
28     +
29     + dlen = strlen(argv0);
30     +@@ -7782,6 +7787,7 @@
31     + memcpy(argv0, display_name, slen);
32     + else
33     + memcpy(argv0, display_name, dlen);
34     ++#endif
35     + }
36     +
37     + static void wsgi_setup_access(WSGIDaemonProcess *daemon)