Re: cvs: /php3 main.c /php3/functions head.c

Tried this latest fix: o The standalone php -q for test/testall still prints the X-Powered-By: PHP *version* and all tests still show fail even through they are actually passing. o Maybe expose_php has to be forced off in main.c in the case -q not-withstanding php3.ini setting for standalone php? Apis -nnnn- On Sat, 25 Dec 1999, Rasmus Lerdorf wrote: > rasmus Sat Dec 25 08:57:23 1999 EDT > > Modified files: > /php3 main.c > /php3/functions head.c > Log: > Put the Powered-by header in a more appropriate place (also fixes 3046) > > > Index: php3/main.c > diff -u php3/main.c:1.507 php3/main.c:1.508 > --- php3/main.c:1.507 Fri Dec 3 08:40:38 1999 > +++ php3/main.c Sat Dec 25 08:57:22 1999 > @@ -29,7 +29,7 @@ > +----------------------------------------------------------------------+ > */ > > -/* $Id: main.c,v 1.507 1999/12/03 13:40:38 zeev Exp $ */ > +/* $Id: main.c,v 1.508 1999/12/25 13:57:22 rasmus Exp $ */ > > /* #define CRASH_DETECTION */ > > @@ -1774,10 +1774,6 @@ > GLOBAL(php3_preprocess) = _cgi_preprocess; > display_source_mode = _cgi_display_source_mode; > > - if (php3_ini.expose_php) { > - PUTS("X-Powered-By: PHP/" PHP_VERSION "\r\n"); > - } > - > php3_TreatHeaders(); > > if (!cgi) { > Index: php3/functions/head.c > diff -u php3/functions/head.c:1.120 php3/functions/head.c:1.121 > --- php3/functions/head.c:1.120 Sat Jun 26 12:47:22 1999 > +++ php3/functions/head.c Sat Dec 25 08:57:23 1999 > @@ -26,7 +26,7 @@ > | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | > +----------------------------------------------------------------------+ > */ > -/* $Id: head.c,v 1.120 1999/06/26 16:47:22 fmk Exp $ */ > +/* $Id: head.c,v 1.121 1999/12/25 13:57:23 rasmus Exp $ */ > #ifdef THREAD_SAFE > #include "tls.h" > #endif > @@ -360,6 +360,9 @@ > if(!strcasecmp(GLOBAL(request_info).request_method, > "put")) > php3_treat_data(PARSE_PUT, NULL); /* PUT Data */ > } > + } > + if (php3_ini.expose_php) { > + PUTS("X-Powered-By: PHP/" PHP_VERSION "\r\n"); > } > if (!GLOBAL(cont_type)) { > #if USE_SAPI > > > > NNNN