Re: cvs: php-src(PHP_4_4) /sapi/pi3web pi3web_sapi.c

I think this change has already been made in the HEAD when Rasmus did add the 'request_time sapi struct' entry recently (1.59). I did correct the PHP_4_4 branch in the same way and assumed this was sufficient. I did not apply the change to the PHP_5_0 branch because I thought the branch will be closed as soon as PHP 5.1 will be released. Ok, now I updated the PHP_5_0 branch too. BTW.: Is there any reason, why the Pi3Web sapi module isn't part of the PHP5 binary dist. for Win32 anymore? Although I provide these files (php5ts.dll and php5pi3web.dll) as part each Win32 release of the Pi3Web web server I cannot cover all PHP releases. -- kind regards, Holger Jani Taskinen schrieb:

    I hope you realize that there are 2 other branches too.
    And usually we commit first to HEAD and then MFH to the branches..

    (FYI: the branches are HEAD, PHP_5_0 and PHP_4_4)

    --Jani

On Sun, 26 Jun 2005, Holger Zimmermann wrote:

holger        Sun Jun 26 05:17:41 2005 EDT

 Modified files:              (Branch: PHP_4_4)
   /php-src/sapi/pi3web    pi3web_sapi.c

Log: Replaced PCHAR by CHAR * (not defined in pi3web_sapi header) http://cvs.php.net/diff.php/php-src/sapi/pi3web/pi3web_sapi.c?r1=1.46.2.7&r2=1.46.2.7.2.1&ty=u Index: php-src/sapi/pi3web/pi3web_sapi.c diff -u php-src/sapi/pi3web/pi3web_sapi.c:1.46.2.7 php-src/sapi/pi3web/pi3web_sapi.c:1.46.2.7.2.1

--- php-src/sapi/pi3web/pi3web_sapi.c:1.46.2.7    Sun Dec  5 04:48:48 2004
+++ php-src/sapi/pi3web/pi3web_sapi.c    Sun Jun 26 05:17:40 2005

@@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pi3web_sapi.c,v 1.46.2.7 2004/12/05 09:48:48 holger Exp $ */ +/* $Id: pi3web_sapi.c,v 1.46.2.7.2.1 2005/06/26 09:17:40 holger Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -57,7 +57,7 @@

    PUTS("<table border=0 cellpadding=3 cellspacing=1 width=600 align=center>\n");
    PUTS("<tr><th colspan=2 bgcolor=\"" PHP_HEADER_COLOR "\">Pi3Web Server Information</th></tr>\n");
    php_info_print_table_header(2, "Information Field", "Value");
-    php_info_print_table_row(2, "Pi3Web SAPI module version", "$Id: pi3web_sapi.c,v 1.46.2.7 2004/12/05 09:48:48 holger Exp $");
+    php_info_print_table_row(2, "Pi3Web SAPI module version", "$Id: pi3web_sapi.c,v 1.46.2.7.2.1 2005/06/26 09:17:40 holger Exp $");
    php_info_print_table_row(2, "Server Name Stamp", HTTPCore_getServerStamp());
    snprintf(variable_buf, 511, "%d", HTTPCore_debugEnabled());
    php_info_print_table_row(2, "Debug Enabled", variable_buf);

@@ -82,7 +82,7 @@

    /* --- loop over all registered server variables --- */
    for(; pIter && PIDBIterator_atValidElement( pIter ); PIDBIterator_next( pIter ) )
    {
-        PCHAR pKey;
+        CHAR *pKey;
        PIDBIterator_current( pIter, &pKey );
        if ( !pKey ) { /* sanity */ continue; };

@@ -289,7 +289,7 @@

    /* --- loop over all registered server variables --- */
    for(; pIter && PIDBIterator_atValidElement( pIter ); PIDBIterator_next( pIter ) )
    {
-        PCHAR pKey;
+        CHAR *pKey;
        PIDBIterator_current( pIter, &pKey );
        if ( !pKey ) { /* sanity */ continue; };