cvs: php4 /sapi/pi3web pi3web_sapi.c pi3web_sapi.h
| From: | Holger Zimmermann | Date: | Thu, 28 Dec 2000 08:31:43 +0000 |
| Subject: | cvs: php4 /sapi/pi3web pi3web_sapi.c pi3web_sapi.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-3313@lists.php.net to get a copy of this message | ||
holger Thu Dec 28 00:31:43 2000 EDT
Added files:
/php4/sapi/pi3web pi3web_sapi.h
Modified files:
/php4/sapi/pi3web pi3web_sapi.c
Log:
Minor update regarding new phpinfo table format. Moved pi3web_sapi.h to the sapi module.
PR:
Submitted by:
Reviewed by:
Obtained from: Pi3Web
Index: php4/sapi/pi3web/pi3web_sapi.c
diff -u php4/sapi/pi3web/pi3web_sapi.c:1.12 php4/sapi/pi3web/pi3web_sapi.c:1.13
--- php4/sapi/pi3web/pi3web_sapi.c:1.12 Fri Nov 17 18:44:04 2000
+++ php4/sapi/pi3web/pi3web_sapi.c Thu Dec 28 00:31:42 2000
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pi3web_sapi.c,v 1.12 2000/11/18 02:44:04 zeev Exp $ */
+/* $Id: pi3web_sapi.c,v 1.13 2000/12/28 08:31:42 holger Exp $ */
#if WIN32|WINNT
# include <windows.h>
@@ -77,10 +77,10 @@
lpCB = (LPCONTROL_BLOCK) SG(server_context);
- PUTS("<table border=5 width=600>\n");
+ 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.12 2000/11/18 02:44:04 zeev Exp $");
+ php_info_print_table_row(2, "Pi3Web SAPI module version", "$Id: pi3web_sapi.c,v
1.13 2000/12/28 08:31:42 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);
@@ -96,7 +96,7 @@
PUTS("</table><BR>");
- PUTS("<table border=5 width=\"600\">\n");
+ PUTS("<table border=0 cellpadding=3 cellspacing=1 width=600 align=center>\n");
PUTS("<tr><th colspan=2 bgcolor=\"" PHP_HEADER_COLOR "\">HTTP
Request Information</th></tr>\n");
php_info_print_table_row(2, "HTTP Request Line", lpCB->lpszReq);
PUTS("<tr><th colspan=2 bgcolor=\"" PHP_HEADER_COLOR "\">HTTP
Headers</th></tr>\n");
Index: php4/sapi/pi3web/pi3web_sapi.h
+++ php4/sapi/pi3web/pi3web_sapi.h
#ifndef _PI3WEB_SAPI_H_
#define _PI3WEB_SAPI_H_
//#if WIN32
//#include <windows.h>
//#else
#define far
#define ERROR_INSUFFICIENT_BUFFER 122L
typedef int BOOL;
typedef void far *LPVOID;
typedef LPVOID HCONN;
typedef unsigned long DWORD;
typedef DWORD far *LPDWORD;
typedef char CHAR;
typedef CHAR *LPSTR;
typedef unsigned char BYTE;
typedef BYTE far *LPBYTE;
//#endif
#ifdef __cplusplus
extern "C" {
#endif
#define PHP_MODE_STANDARD 0
#define PHP_MODE_HIGHLIGHT 1
#define PHP_MODE_INDENT 2
//
// passed to the procedure on a new request
//
typedef struct _CONTROL_BLOCK {
void *pPIHTTP;
DWORD cbSize; // size of this struct.
HCONN ConnID; // Context number not to be modified!
DWORD dwHttpStatusCode; // HTTP Status code
CHAR lpszLogData[80]; // null terminated log info
LPSTR lpszMethod; // REQUEST_METHOD
LPSTR lpszQueryString; // QUERY_STRING
LPSTR lpszPathInfo; // PATH_INFO
LPSTR lpszPathTranslated; // PATH_TRANSLATED
LPSTR lpszFileName; // FileName to PHP3 physical file
LPSTR lpszUri; // The request URI
LPSTR lpszReq; // The whole HTTP request line
LPSTR lpszUser; // The authenticated user
LPSTR lpszPassword; // The authenticated password
DWORD cbTotalBytes; // Total bytes indicated from client
DWORD cbAvailable; // Available number of bytes
LPBYTE lpbData; // pointer to cbAvailable bytes
LPSTR lpszContentType; // Content type of client data
DWORD dwBehavior; // PHP behavior (standard, highlight, intend
BOOL (* GetServerVariable) ( HCONN hConn,
LPSTR lpszVariableName,
LPVOID lpvBuffer,
LPDWORD lpdwSize );
BOOL (* WriteClient) ( HCONN ConnID,
LPVOID Buffer,
LPDWORD lpdwBytes,
DWORD dwReserved );
BOOL (* ReadClient) ( HCONN ConnID,
LPVOID lpvBuffer,
LPDWORD lpdwSize );
BOOL (* SendHeaderFunction)( HCONN hConn,
LPDWORD lpdwSize,
LPDWORD lpdwDataType );
} CONTROL_BLOCK, *LPCONTROL_BLOCK;
#ifndef WIN32
#define __stdcall
#endif
DWORD fnWrapperProc(LPCONTROL_BLOCK lpCB);
// the following type declarations is for the server side
typedef DWORD ( * PFN_WRAPPERPROC )( CONTROL_BLOCK *pCB );
BOOL PHP4_startup();
BOOL PHP4_shutdown();
#ifdef __cplusplus
}
#endif
#endif // end definition _PI3WEB_SAPI_H_