cvs: php4 /sapi/roxen roxen.c

yohgaki Thu Jan 31 05:15:07 2002 EDT Modified files: /php4/sapi/roxen roxen.c Log: A fix for the bug number 13231 & 11699. Makes the roxen support compile. Patch by Lars Wilhelmsen <lars@sral.org> Index: php4/sapi/roxen/roxen.c diff -u php4/sapi/roxen/roxen.c:1.51 php4/sapi/roxen/roxen.c:1.52 --- php4/sapi/roxen/roxen.c:1.51 Tue Dec 11 10:32:07 2001 +++ php4/sapi/roxen/roxen.c Thu Jan 31 05:15:07 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: roxen.c,v 1.51 2001/12/11 15:32:07 sebastian Exp $ */ +/* $Id: roxen.c,v 1.52 2002/01/31 10:15:07 yohgaki Exp $ */ #include "php.h" #ifdef HAVE_ROXEN @@ -438,7 +438,7 @@ { /* char buf[512]; */ php_info_print_table_start(); - php_info_print_table_row(2, "SAPI module version", "$Id: roxen.c,v 1.51 2001/12/11 15:32:07 sebastian Exp $"); + php_info_print_table_row(2, "SAPI module version", "$Id: roxen.c,v 1.52 2002/01/31 10:15:07 yohgaki Exp $"); /* php_info_print_table_row(2, "Build date", Ns_InfoBuildDate()); php_info_print_table_row(2, "Config file path", Ns_InfoConfigFile()); php_info_print_table_row(2, "Error Log path", Ns_InfoErrorLog()); @@ -618,12 +618,12 @@ 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 @@ { 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;