Re: cvs: php4(PHP_4_0_7) /sapi/roxen roxen.c

Hello, Why are you merging this? This absolutely makes no sense, 1) this branch is proably not used anymore in the future, 2) It's not anyware near a critical thing. Please revert it. Derick On Sun, 3 Feb 2002, Yasuo Ohgaki wrote: > yohgaki Sat Feb 2 19:38:00 2002 EDT > > Modified files: (Branch: PHP_4_0_7) > /php4/sapi/roxen roxen.c > Log: > MFH > > > Index: php4/sapi/roxen/roxen.c > diff -u php4/sapi/roxen/roxen.c:1.47.2.1 php4/sapi/roxen/roxen.c:1.47.2.2 > --- php4/sapi/roxen/roxen.c:1.47.2.1 Fri Oct 12 07:56:37 2001 > +++ php4/sapi/roxen/roxen.c Sat Feb 2 19:38:00 2002 > @@ -17,7 +17,7 @@ > +----------------------------------------------------------------------+ > */ > > -/* $Id: roxen.c,v 1.47.2.1 2001/10/12 11:56:37 ssb Exp $ */ > +/* $Id: roxen.c,v 1.47.2.2 2002/02/03 00:38:00 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.47.2.1 > 2001/10/12 11:56:37 ssb Exp $"); > + php_info_print_table_row(2, "SAPI module version", "$Id: roxen.c,v 1.47.2.2 > 2002/02/03 00:38:00 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; > > > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, e-mail: php-cvs-unsubscribe@lists.php.net > For additional commands, e-mail: php-cvs-help@lists.php.net > To contact the list administrators, e-mail: php-list-admin@lists.php.net >