Minor update regarding new phpinfo table format. Moved pi3web_sapi.h to the sapi...

PR:
Submitted by:
Reviewed by:
Obtained from: Pi3Web

diff --git a/sapi/pi3web/pi3web_sapi.c b/sapi/pi3web/pi3web_sapi.c
index fc34acdeb7014de1da51d246188a9c4882ad07c7..c9ad0b8481afb6aef38594a72d48c3732920fdec 100644 (file)
--- a/sapi/pi3web/pi3web_sapi.c
+++ b/sapi/pi3web/pi3web_sapi.c
@@ -77,7 +77,7 @@ static void php_info_pi3web(ZEND_MODULE_INFO_FUNC_ARGS)
 
        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$");
@@ -96,7 +96,7 @@ static void php_info_pi3web(ZEND_MODULE_INFO_FUNC_ARGS)
 
        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");

diff --git a/sapi/pi3web/pi3web_sapi.h b/sapi/pi3web/pi3web_sapi.h
new file mode 100644 (file)
index 0000000..340d982
--- /dev/null
+++ b/sapi/pi3web/pi3web_sapi.h
@@ -0,0 +1,91 @@
+#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_