diff options
Diffstat (limited to 'sapi/roxen')
| -rw-r--r-- | sapi/roxen/README | 4 | ||||
| -rw-r--r-- | sapi/roxen/TODO | 12 | ||||
| -rw-r--r-- | sapi/roxen/config.m4 | 2 | ||||
| -rw-r--r-- | sapi/roxen/roxen.c | 8 |
4 files changed, 13 insertions, 13 deletions
diff --git a/sapi/roxen/README b/sapi/roxen/README index c6ec30d272..d834a0000e 100644 --- a/sapi/roxen/README +++ b/sapi/roxen/README @@ -8,9 +8,9 @@ script is executed at any one time). The second option is using ZTS (Zend Thread Safe mode). Unless --enable-roxen-zts is specified, this won't be used. -This solution now works fine and is recommended. Multiple PHP4 +This solution now works fine and is recommended. Multiple PHP5 requests will be run in parallell. The maximum number of parallell -PHP4-execution is limited to the number of handle threads Roxen is +PHP5-execution is limited to the number of handle threads Roxen is started with. Support for this module is lacking. Please contact Roxen Internet diff --git a/sapi/roxen/TODO b/sapi/roxen/TODO index 4ba171accc..248f36f52e 100644 --- a/sapi/roxen/TODO +++ b/sapi/roxen/TODO @@ -10,18 +10,18 @@ BUGS: And another error (when trying to include a class) Recursive mutex locks! - /Usr/local/pike/7.0.54/lib/modules/PHP4.so.Interpreter: - run("/home/www/www.tx.pl/news/test.php",mapping[3],modules/scripting/php4.pike.PHPScript(),modules/scripting/php4.pike.PHPScript.done) - modules/scripting/php4.pike:169: run() + /Usr/local/pike/7.0.54/lib/modules/PHP5.so.Interpreter: + run("/home/www/www.tx.pl/news/test.php",mapping[3],modules/scripting/php5.pike.PHPScript(),modules/scripting/php5.pike.PHPScript.done) + modules/scripting/php5.pike:169: run() base_server/roxen.pike:569: handler_thread(3). And after this every access to any php script (on other virtual sites also) ends (of course there is no proper output) with this error: Php4.Interpreter->run: Tried to run a PHP-script from a PHP - callback!/usr/local/pike/7.0.54/lib/modules/PHP4.so.Interpreter: - run("/home/www/biall.com.pl/index.php3",mapping[2],modules/scripting/php4.pike.PHPScript(),modules/scripting/php4.pike.PHPScript.done) - modules/scripting/php4.pike:169: run() + callback!/usr/local/pike/7.0.54/lib/modules/PHP5.so.Interpreter: + run("/home/www/biall.com.pl/index.php3",mapping[2],modules/scripting/php5.pike.PHPScript(),modules/scripting/php5.pike.PHPScript.done) + modules/scripting/php5.pike:169: run() base_server/roxen.pike:569: handler_thread(3). diff --git a/sapi/roxen/config.m4 b/sapi/roxen/config.m4 index cf2726b51b..6634964e94 100644 --- a/sapi/roxen/config.m4 +++ b/sapi/roxen/config.m4 @@ -31,7 +31,7 @@ AC_ARG_WITH(roxen, PHP_ADD_INCLUDE($PIKE_INCLUDE_DIR) AC_DEFINE(HAVE_ROXEN,1,[Whether you use Roxen]) PHP_SELECT_SAPI(roxen, shared, roxen.c) - INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $PIKE_MODULE_DIR/PHP4.so" + INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $PIKE_MODULE_DIR/PHP5.so" RESULT="yes Pike binary used: $PIKE Pike include dir: $PIKE_INCLUDE_DIR diff --git a/sapi/roxen/roxen.c b/sapi/roxen/roxen.c index d580fe3a48..c0ec83f2ba 100644 --- a/sapi/roxen/roxen.c +++ b/sapi/roxen/roxen.c @@ -615,12 +615,12 @@ void f_php_roxen_request_handler(INT32 args) TSRMLS_FETCH(); if(current_thread == th_self()) - php_error(E_WARNING, "PHP4.Interpreter->run: Tried to run a PHP-script from a PHP " + php_error(E_WARNING, "PHP5.Interpreter->run: Tried to run a PHP-script from a PHP " "callback!"); - get_all_args("PHP4.Interpreter->run", args, "%S%m%O%*", &script, + get_all_args("PHP5.Interpreter->run", args, "%S%m%O%*", &script, &request_data, &my_fd_obj, &done_callback); if(done_callback->type != PIKE_T_FUNCTION) - php_error(E_WARNING, "PHP4.Interpreter->run: Bad argument 4, expected function.\n"); + php_error(E_WARNING, "PHP5.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 @@ -656,7 +656,7 @@ void f_php_roxen_request_handler(INT32 args) { int fd = fd_from_object(raw_fd->u.object); if(fd == -1) - php_error(E_WARNING, "PHP4.Interpreter->run: my_fd object not open or not an FD.\n"); + php_error(E_WARNING, "PHP5.Interpreter->run: my_fd object not open or not an FD.\n"); THIS->my_fd = fd; } else THIS->my_fd = 0; |