A fix for the bug number 13231 & 11699.

Makes the roxen support compile.  Patch by Lars Wilhelmsen <lars@sral.org>

diff --git a/sapi/roxen/roxen.c b/sapi/roxen/roxen.c
index a7150c4ce09c45bc18d182fa09e181f210e2ab79..400fdc65074e102008b709260a6b7b545114f5e6 100644 (file)
--- a/sapi/roxen/roxen.c
+++ b/sapi/roxen/roxen.c
@@ -618,12 +618,12 @@ void f_php_roxen_request_handler(INT32 args)
   TSRMLS_FETCH();
 
   if(current_thread == th_self())
-    error("PHP4.Interpreter->run: Tried to run a PHP-script from a PHP "
+    php_error(E_WARNING, "PHP4.Interpreter->run: Tried to run a PHP-script from a PHP "
          "callback!");
   get_all_args("PHP4.Interpreter->run", args, "%S%m%O%*", &script,
               &request_data, &my_fd_obj, &done_callback);
   if(done_callback->type != PIKE_T_FUNCTION) 
-    error("PHP4.Interpreter->run: Bad argument 4, expected function.\n");
+    php_error(E_WARNING, "PHP4.Interpreter->run: Bad argument 4, expected function.\n");
   PHP_LOCK(THIS); /* Need to lock here or reusing the same object might cause
                       * problems in changing stuff in that object */
 #ifndef ROXEN_USE_ZTS
@@ -659,7 +659,7 @@ void f_php_roxen_request_handler(INT32 args)
   {
     int fd = fd_from_object(raw_fd->u.object);
     if(fd == -1)
-      error("PHP4.Interpreter->run: my_fd object not open or not an FD.\n");
+      php_error(E_WARNING, "PHP4.Interpreter->run: my_fd object not open or not an FD.\n");
     THIS->my_fd = fd;
   } else
     THIS->my_fd = 0;