httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From iga...@apache.org
Subject svn commit: r1139534 - /httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_unix.c
Date Sat, 25 Jun 2011 12:24:39 GMT
Author: igalic
Date: Sat Jun 25 12:24:38 2011
New Revision: 1139534

URL: http://svn.apache.org/viewvc?rev=1139534&view=rev
Log:
Fix to PR50249: make mod_fcgidbuild against APR trunk

Modified:
    httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_unix.c

Modified: httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_unix.c
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_unix.c?rev=1139534&r1=1139533&r2=1139534&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_unix.c (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_unix.c Sat Jun 25 12:24:38 2011
@@ -21,7 +21,10 @@
 #include "apr_strings.h"
 #include "apr_queue.h"
 #include "apr_global_mutex.h"
+#include "apr_version.h"
+#if APR_MAJOR_VERSION < 2
 #include "apr_support.h"
+#endif
 #include "http_config.h"
 #include "fcgid_pm.h"
 #include "fcgid_pm_main.h"
@@ -522,7 +525,11 @@ apr_status_t procmgr_peek_cmd(fcgid_comm
         return APR_EPIPE;
 
     /* Wait for next command */
+#if APR_MAJOR_VERSION < 2
     rv = apr_wait_for_io_or_timeout(g_pm_read_pipe, NULL, FOR_READ);
+#else
+    rv = apr_file_pipe_wait(g_pm_read_pipe, APR_WAIT_READ);
+#endif
 
     /* Log any unexpect result */
     if (rv != APR_SUCCESS && !APR_STATUS_IS_TIMEUP(rv)) {



Mime
View raw message