diff options
| author | Yasuo Ohgaki <yohgaki@php.net> | 2002-01-31 10:15:07 +0000 |
|---|---|---|
| committer | Yasuo Ohgaki <yohgaki@php.net> | 2002-01-31 10:15:07 +0000 |
| commit | 866a6092081c3e2cc9d898fc173aee99d740f3af (patch) | |
| tree | 2c16876568795bcc3f93bce59afaea3eb463685f /sapi/roxen/roxen.c | |
| parent | d26afcf3667a41012642c6c39efd8a6cdead0f15 (diff) | |
| download | php-git-866a6092081c3e2cc9d898fc173aee99d740f3af.tar.gz | |
A fix for the bug number 13231 & 11699.
Makes the roxen support compile. Patch by Lars Wilhelmsen <lars@sral.org>
Diffstat (limited to 'sapi/roxen/roxen.c')
| -rw-r--r-- | sapi/roxen/roxen.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sapi/roxen/roxen.c b/sapi/roxen/roxen.c index a7150c4ce0..400fdc6507 100644 --- 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; |