[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/sapi/fpm/config.m4 trunk/sapi/fpm/config.m4

[Antony Dovgal]

tony2001                                 Wed, 16 Jun 2010 08:58:42 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=300489

Log:
improve ptrace() test
change error to warning - there can be no trace method available at all

Changed paths:
    U   php/php-src/branches/PHP_5_3/sapi/fpm/config.m4
    U   php/php-src/trunk/sapi/fpm/config.m4

Modified: php/php-src/branches/PHP_5_3/sapi/fpm/config.m4
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/fpm/config.m4     2010-06-16 02:14:32 UTC 
(rev 300488)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/config.m4     2010-06-16 08:58:42 UTC 
(rev 300489)
@@ -362,7 +362,7 @@
           int ret = 0;

           if (0 > ptrace(PTRACE_ATTACH, child, 0, 0)) {
-            return 1;
+            return 2;
           }

           waitpid(child, &status, 0);
@@ -376,7 +376,7 @@
           };

           if (0 > ptrace(PT_IO, child, (void *) &ptio, 0)) {
-            ret = 1;
+            ret = 3;
           }
       #else
           errno = 0;
@@ -384,7 +384,7 @@
           v2 = ptrace(PTRACE_PEEKDATA, child, (void *) &v1, 0);

           if (errno) {
-            ret = 1;
+            ret = 4;
           }
       #endif
           ptrace(PTRACE_DETACH, child, (void *) 1, 0);
@@ -495,7 +495,7 @@
     fpm_trace_type=mach

   else
-    AC_MSG_ERROR([FPM Trace - ptrace, pread, or mach: could not be found])
+    AC_MSG_WARN([FPM Trace - ptrace, pread, or mach: could not be found])
   fi

 ])

Modified: php/php-src/trunk/sapi/fpm/config.m4
===================================================================
--- php/php-src/trunk/sapi/fpm/config.m4        2010-06-16 02:14:32 UTC (rev 
300488)
+++ php/php-src/trunk/sapi/fpm/config.m4        2010-06-16 08:58:42 UTC (rev 
300489)
@@ -362,7 +362,7 @@
           int ret = 0;

           if (0 > ptrace(PTRACE_ATTACH, child, 0, 0)) {
-            return 1;
+            return 2;
           }

           waitpid(child, &status, 0);
@@ -376,7 +376,7 @@
           };

           if (0 > ptrace(PT_IO, child, (void *) &ptio, 0)) {
-            ret = 1;
+            ret = 3;
           }
       #else
           errno = 0;
@@ -384,7 +384,7 @@
           v2 = ptrace(PTRACE_PEEKDATA, child, (void *) &v1, 0);

           if (errno) {
-            ret = 1;
+            ret = 4;
           }
       #endif
           ptrace(PTRACE_DETACH, child, (void *) 1, 0);
@@ -495,7 +495,7 @@
     fpm_trace_type=mach

   else
-    AC_MSG_ERROR([FPM Trace - ptrace, pread, or mach: could not be found])
+    AC_MSG_WARN([FPM Trace - ptrace, pread, or mach: could not be found])
   fi

 ])


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php