Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/apache2-mod_python/patches/apache2-mod_python-3.3.1-apache-2.4.patch

    Contents of /trunk/apache2-mod_python/patches/apache2-mod_python-3.3.1-apache-2.4.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 942 - (show annotations) (download)
    Tue Dec 1 08:23:40 2009 UTC (14 years, 5 months ago) by niro
    File size: 1284 byte(s) 
    several fixes
    1 TODO:
    2 src/requestobject.c uses ap_requires() which has been removed in r368027.
    3 https://svn.apache.org/viewvc?view=rev&revision=368027
    4
    5 --- src/include/mod_python.h.in
    6 +++ src/include/mod_python.h.in
    7 @@ -72,6 +72,11 @@
    8 #endif
    9 #endif
    10
    11 +#if !AP_MODULE_MAGIC_AT_LEAST(20081201,0)
    12 +#define ap_unixd_config unixd_config
    13 +#define ap_unixd_set_global_mutex_perms unixd_set_global_mutex_perms
    14 +#endif
    15 +
    16 /* Python headers */
    17 /* this gets rid of some compile warnings */
    18 #if defined(_POSIX_THREADS)
    19 --- src/mod_python.c
    20 +++ src/mod_python.c
    21 @@ -555,14 +555,14 @@
    22 else {
    23
    24 /*XXX As of httpd 2.0.4, the below should be just
    25 - a call to unixd_set_global_mutex_perms(mutex[n]); and
    26 + a call to ap_unixd_set_global_mutex_perms(mutex[n]); and
    27 nothing else... For now, while 2.0.48 isn't commonplace yet,
    28 this ugly code should be here */
    29
    30 #if !defined(OS2) && !defined(WIN32) && !defined(BEOS) && !defined(NETWARE)
    31 if (!geteuid()) {
    32 - chown(fname, unixd_config.user_id, -1);
    33 - unixd_set_global_mutex_perms(mutex[n]);
    34 + chown(fname, ap_unixd_config.user_id, -1);
    35 + ap_unixd_set_global_mutex_perms(mutex[n]);
    36 }
    37 #endif
    38 }