diff options
| author | foobar <sniper@php.net> | 2004-01-17 13:00:38 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2004-01-17 13:00:38 +0000 |
| commit | f4983c0d3f56c2074458e4840db36643b2fec59b (patch) | |
| tree | 2dcf521f07114e3bb2952439fe28cdfa40d30677 /sapi/caudium | |
| parent | b851f3712388de9f6c4addf2063dbc3c663a0b3b (diff) | |
| download | php-git-f4983c0d3f56c2074458e4840db36643b2fec59b.tar.gz | |
- Renamed all *php4* files to *php5*, changed all php4/PHP4 to php5/PHP5
Diffstat (limited to 'sapi/caudium')
| -rw-r--r-- | sapi/caudium/caudium.c | 10 | ||||
| -rw-r--r-- | sapi/caudium/config.m4 | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sapi/caudium/caudium.c b/sapi/caudium/caudium.c index 1cf4137911..68ba73b60e 100644 --- a/sapi/caudium/caudium.c +++ b/sapi/caudium/caudium.c @@ -38,7 +38,7 @@ */ #define NO_PIKE_SHORTHAND -/* Ok, we are now using Pike level threads to handle PHP4 since +/* Ok, we are now using Pike level threads to handle PHP5 since * the nice th_farm threads aren't working on Linux with glibc 2.2 * (why this is I don't know). */ @@ -79,7 +79,7 @@ #endif #ifndef PIKE_THREADS -#error The PHP4 module requires that your Pike has thread support. +#error The PHP5 module requires that your Pike has thread support. #endif #undef HIDE_GLOBAL_VARIABLES @@ -624,7 +624,7 @@ static void php_caudium_module_main(php_caudium_request *ureq) SG(request_info).headers_only = 0; } - /* Let PHP4 handle the deconding of the AUTH */ + /* Let PHP5 handle the deconding of the AUTH */ php_handle_auth_data(lookup_string_header("HTTP_AUTHORIZATION", NULL), TSRMLS_C); /* Swap out this thread and release the interpreter lock to allow * Pike threads to run. We wait since the above would otherwise require @@ -713,10 +713,10 @@ void f_php_caudium_request_handler(INT32 args) if(THIS == NULL) Pike_error("Out of memory."); - 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) - Pike_error("PHP4.Interpreter->run: Bad argument 4, expected function.\n"); + Pike_error("PHP5.Interpreter->run: Bad argument 4, expected function.\n"); add_ref(request_data); add_ref(my_fd_obj); add_ref(script); diff --git a/sapi/caudium/config.m4 b/sapi/caudium/config.m4 index 6d5e4bbc19..ef36a5ea6e 100644 --- a/sapi/caudium/config.m4 +++ b/sapi/caudium/config.m4 @@ -78,12 +78,12 @@ AC_ARG_WITH(caudium, AC_MSG_RESULT(not found) fi else - AC_MSG_ERROR(Caudium PHP4 requires Pike 7.0 or newer) + AC_MSG_ERROR(Caudium PHP5 requires Pike 7.0 or newer) fi PIKE_VERSION=`$PIKE -e 'string v; int rel;sscanf(version(), "Pike v%s release %d", v, rel); write(v+"."+rel);'` AC_DEFINE(HAVE_CAUDIUM,1,[Whether to compile with Caudium support]) PHP_SELECT_SAPI(caudium, shared, caudium.c) - INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $withval/lib/$PIKE_VERSION/PHP4.so" + INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $withval/lib/$PIKE_VERSION/PHP5.so" RESULT=" *** Pike binary used: $PIKE *** Pike include dir(s) used: $PIKE_INCLUDE_DIR *** Pike version: $PIKE_VERSION" |