[PHP-CVS] cvs: php-src(PHP_4_3) /sapi/pi3web php4pi3web.dsp pi3web_sapi.c pi3web_sapi.h
holger Sun Dec 5 04:48:48 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/sapi/pi3webpi3web_sapi.c php4pi3web.dsp pi3web_sapi.h
Log:
Replaced static server variables by function call and configurable list at
the Pi3Web server side.
http://cvs.php.net/diff.php/php-src/sapi/pi3web/pi3web_sapi.c?r1=1.46.2.6r2=1.46.2.7ty=u
Index: php-src/sapi/pi3web/pi3web_sapi.c
diff -u php-src/sapi/pi3web/pi3web_sapi.c:1.46.2.6
php-src/sapi/pi3web/pi3web_sapi.c:1.46.2.7
--- php-src/sapi/pi3web/pi3web_sapi.c:1.46.2.6 Mon Jun 2 13:14:10 2003
+++ php-src/sapi/pi3web/pi3web_sapi.c Sun Dec 5 04:48:48 2004
@@ -21,11 +21,10 @@
+--+
*/
-/* $Id: pi3web_sapi.c,v 1.46.2.6 2003/06/02 17:14:10 holger Exp $ */
+/* $Id: pi3web_sapi.c,v 1.46.2.7 2004/12/05 09:48:48 holger Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
-#include pi3web_sapi.h
#include php.h
#include php_main.h
#include php_variables.h
@@ -40,45 +39,25 @@
#include PiAPI.h
#include Pi3API.h
+#include pi3web_sapi.h
+
#define PI3WEB_SERVER_VAR_BUF_SIZE 1024
int IWasLoaded=0;
-static char *pi3web_server_variables[] = {
- ALL_HTTP,
- AUTH_TYPE,
- CONTENT_LENGTH,
- CONTENT_TYPE,
- GATEWAY_INTERFACE,
- PATH_INFO,
- PATH_TRANSLATED,
- QUERY_STRING,
- REQUEST_METHOD,
- REMOTE_ADDR,
- REMOTE_HOST,
- REMOTE_USER,
- SCRIPT_NAME,
- SERVER_NAME,
- SERVER_PORT,
- SERVER_PROTOCOL,
- SERVER_SOFTWARE,
- NULL
-};
-
static void php_info_pi3web(ZEND_MODULE_INFO_FUNC_ARGS)
{
- char **p = pi3web_server_variables;
char variable_buf[PI3WEB_SERVER_VAR_BUF_SIZE];
DWORD variable_len;
- LPCONTROL_BLOCK lpCB;
-
- lpCB = (LPCONTROL_BLOCK) SG(server_context);
+ LPCONTROL_BLOCK lpCB = (LPCONTROL_BLOCK) SG(server_context);
+ PIDB *pDB = (PIDB *)lpCB-GetVariableNames(lpCB-ConnID);
+ PIDBIterator *pIter = PIDB_getIterator( pDB, PIDBTYPE_STRING, 0, 0 );
PUTS(table border=0 cellpadding=3 cellspacing=1 width=600
align=center\n);
PUTS(trth 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.6 2003/06/02 17:14:10 holger Exp $);
+ 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, Server Name Stamp,
HTTPCore_getServerStamp());
snprintf(variable_buf, 511, %d, HTTPCore_debugEnabled());
php_info_print_table_row(2, Debug Enabled, variable_buf);
@@ -99,22 +78,28 @@
php_info_print_table_row(2, HTTP Request Line, lpCB-lpszReq);
PUTS(trth colspan=2 bgcolor=\ PHP_HEADER_COLOR \HTTP
Headers/th/tr\n);
php_info_print_table_header(2, Server Variable, Value);
- while (*p) {
+
+ /* --- loop over all registered server variables --- */
+ for(; pIter PIDBIterator_atValidElement( pIter ); PIDBIterator_next(
pIter ) )
+ {
+ PCHAR pKey;
+ PIDBIterator_current( pIter, pKey );
+ if ( !pKey ) { /* sanity */ continue; };
+
variable_len = PI3WEB_SERVER_VAR_BUF_SIZE;
- if (lpCB-GetServerVariable(lpCB-ConnID, *p, variable_buf,
variable_len)
+ if (lpCB-GetServerVariable(lpCB-ConnID, pKey, variable_buf,
variable_len)
variable_buf[0]) {
- php_info_print_table_row(2, *p, variable_buf);
+ php_info_print_table_row(2, pKey, variable_buf);
} else if (PIPlatform_getLastError() == PIAPI_EINVAL) {
char *tmp_variable_buf;
tmp_variable_buf = (char *) emalloc(variable_len);
- if (lpCB-GetServerVariable(lpCB-ConnID, *p,
tmp_variable_buf, variable_len)
+ if (lpCB-GetServerVariable(lpCB-ConnID, pKey,
tmp_variable_buf, variable_len)
variable_buf[0]) {
- php_info_print_table_row(2, *p,
tmp_variable_buf);
+ php_info_print_table_row(2, pKey,
tmp_variable_buf);
}
efree(tmp_variable_buf);
}
- p++;
}
PUTS(/table);
@@ -297,26 +282,29 @@
char static_variable_buf[PI3WEB_SERVER_VAR_BUF_SIZE];
char *variable_buf;
DWORD variable_len = PI3WEB_SERVER_VAR_BUF_SIZE;
- char *variable;
- char *strtok_buf = NULL;
LPCONTROL_BLOCK lpCB = (LPCONTROL_BLOCK) SG(server_context);
- char **p =
[PHP-CVS] cvs: php-src /sapi/pi3web php5pi3web.dsp pi3web_sapi.c pi3web_sapi.h
holger Sun Dec 5 04:52:25 2004 EDT
Modified files:
/php-src/sapi/pi3webpi3web_sapi.c php5pi3web.dsp pi3web_sapi.h
Log:
Replaced static server variables by function call and configurable list at
the Pi3Web server side.
http://cvs.php.net/diff.php/php-src/sapi/pi3web/pi3web_sapi.c?r1=1.57r2=1.58ty=u
Index: php-src/sapi/pi3web/pi3web_sapi.c
diff -u php-src/sapi/pi3web/pi3web_sapi.c:1.57
php-src/sapi/pi3web/pi3web_sapi.c:1.58
--- php-src/sapi/pi3web/pi3web_sapi.c:1.57 Sat Jan 17 08:00:15 2004
+++ php-src/sapi/pi3web/pi3web_sapi.c Sun Dec 5 04:52:25 2004
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: pi3web_sapi.c,v 1.57 2004/01/17 13:00:15 sniper Exp $ */
+/* $Id: pi3web_sapi.c,v 1.58 2004/12/05 09:52:25 holger Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -45,41 +45,19 @@
int IWasLoaded=0;
-static char *pi3web_server_variables[] = {
- ALL_HTTP,
- AUTH_TYPE,
- CONTENT_LENGTH,
- CONTENT_TYPE,
- GATEWAY_INTERFACE,
- PATH_INFO,
- PATH_TRANSLATED,
- QUERY_STRING,
- REQUEST_METHOD,
- REMOTE_ADDR,
- REMOTE_HOST,
- REMOTE_USER,
- SCRIPT_NAME,
- SERVER_NAME,
- SERVER_PORT,
- SERVER_PROTOCOL,
- SERVER_SOFTWARE,
- NULL
-};
-
static void php_info_pi3web(ZEND_MODULE_INFO_FUNC_ARGS)
{
- char **p = pi3web_server_variables;
char variable_buf[PI3WEB_SERVER_VAR_BUF_SIZE];
DWORD variable_len;
- LPCONTROL_BLOCK lpCB;
-
- lpCB = (LPCONTROL_BLOCK) SG(server_context);
+ LPCONTROL_BLOCK lpCB = (LPCONTROL_BLOCK) SG(server_context);
+ PIDB *pDB = (PIDB *)lpCB-GetVariableNames(lpCB-ConnID);
+ PIDBIterator *pIter = PIDB_getIterator( pDB, PIDBTYPE_STRING, 0, 0 );
PUTS(table border=0 cellpadding=3 cellspacing=1 width=600
align=center\n);
PUTS(trth 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.57 2004/01/17 13:00:15 sniper Exp $);
+ php_info_print_table_row(2, Pi3Web SAPI module version, $Id:
pi3web_sapi.c,v 1.58 2004/12/05 09:52:25 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);
@@ -100,22 +78,28 @@
php_info_print_table_row(2, HTTP Request Line, lpCB-lpszReq);
PUTS(trth colspan=2 bgcolor=\ PHP_HEADER_COLOR \HTTP
Headers/th/tr\n);
php_info_print_table_header(2, Server Variable, Value);
- while (*p) {
+
+ /* --- loop over all registered server variables --- */
+ for(; pIter PIDBIterator_atValidElement( pIter ); PIDBIterator_next(
pIter ) )
+ {
+ PCHAR pKey;
+ PIDBIterator_current( pIter, pKey );
+ if ( !pKey ) { /* sanity */ continue; };
+
variable_len = PI3WEB_SERVER_VAR_BUF_SIZE;
- if (lpCB-GetServerVariable(lpCB-ConnID, *p, variable_buf,
variable_len)
+ if (lpCB-GetServerVariable(lpCB-ConnID, pKey, variable_buf,
variable_len)
variable_buf[0]) {
- php_info_print_table_row(2, *p, variable_buf);
+ php_info_print_table_row(2, pKey, variable_buf);
} else if (PIPlatform_getLastError() == PIAPI_EINVAL) {
char *tmp_variable_buf;
tmp_variable_buf = (char *) emalloc(variable_len);
- if (lpCB-GetServerVariable(lpCB-ConnID, *p,
tmp_variable_buf, variable_len)
+ if (lpCB-GetServerVariable(lpCB-ConnID, pKey,
tmp_variable_buf, variable_len)
variable_buf[0]) {
- php_info_print_table_row(2, *p,
tmp_variable_buf);
+ php_info_print_table_row(2, pKey,
tmp_variable_buf);
}
efree(tmp_variable_buf);
}
- p++;
}
PUTS(/table);
@@ -298,68 +282,38 @@
char static_variable_buf[PI3WEB_SERVER_VAR_BUF_SIZE];
char *variable_buf;
DWORD variable_len = PI3WEB_SERVER_VAR_BUF_SIZE;
- char *variable;
- char *strtok_buf = NULL;
LPCONTROL_BLOCK lpCB = (LPCONTROL_BLOCK) SG(server_context);
- char **p = pi3web_server_variables;
- p++; // Jump over ALL_HTTP;
+ PIDB *pDB = (PIDB *)lpCB-GetVariableNames(lpCB-ConnID);
+ PIDBIterator *pIter = PIDB_getIterator( pDB, PIDBTYPE_STRING, 0, 0 );
+
+ /* --- loop over all registered server
Re: [PHP-CVS] cvs: php-src /sapi/pi3web php5pi3web.dsp pi3web_sapi.c pi3web_sapi.h
Hi,
what about the 5_0 branch?
Thanks,
Andrey
Holger Zimmermann wrote:
holger Sun Dec 5 04:52:25 2004 EDT
Modified files:
/php-src/sapi/pi3web pi3web_sapi.c php5pi3web.dsp pi3web_sapi.h
Log:
Replaced static server variables by function call and configurable list at the Pi3Web server side.
http://cvs.php.net/diff.php/php-src/sapi/pi3web/pi3web_sapi.c?r1=1.57r2=1.58ty=u
Index: php-src/sapi/pi3web/pi3web_sapi.c
diff -u php-src/sapi/pi3web/pi3web_sapi.c:1.57 php-src/sapi/pi3web/pi3web_sapi.c:1.58
--- php-src/sapi/pi3web/pi3web_sapi.c:1.57 Sat Jan 17 08:00:15 2004
+++ php-src/sapi/pi3web/pi3web_sapi.c Sun Dec 5 04:52:25 2004
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: pi3web_sapi.c,v 1.57 2004/01/17 13:00:15 sniper Exp $ */
+/* $Id: pi3web_sapi.c,v 1.58 2004/12/05 09:52:25 holger Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -45,41 +45,19 @@
int IWasLoaded=0;
-static char *pi3web_server_variables[] = {
- ALL_HTTP,
- AUTH_TYPE,
- CONTENT_LENGTH,
- CONTENT_TYPE,
- GATEWAY_INTERFACE,
- PATH_INFO,
- PATH_TRANSLATED,
- QUERY_STRING,
- REQUEST_METHOD,
- REMOTE_ADDR,
- REMOTE_HOST,
- REMOTE_USER,
- SCRIPT_NAME,
- SERVER_NAME,
- SERVER_PORT,
- SERVER_PROTOCOL,
- SERVER_SOFTWARE,
- NULL
-};
-
static void php_info_pi3web(ZEND_MODULE_INFO_FUNC_ARGS)
{
- char **p = pi3web_server_variables;
char variable_buf[PI3WEB_SERVER_VAR_BUF_SIZE];
DWORD variable_len;
- LPCONTROL_BLOCK lpCB;
-
- lpCB = (LPCONTROL_BLOCK) SG(server_context);
+ LPCONTROL_BLOCK lpCB = (LPCONTROL_BLOCK) SG(server_context);
+ PIDB *pDB = (PIDB *)lpCB-GetVariableNames(lpCB-ConnID);
+ PIDBIterator *pIter = PIDB_getIterator( pDB, PIDBTYPE_STRING, 0, 0 );
PUTS(table border=0 cellpadding=3 cellspacing=1 width=600 align=center\n);
PUTS(trth 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.57 2004/01/17 13:00:15 sniper Exp $);
+ php_info_print_table_row(2, Pi3Web SAPI module version, $Id: pi3web_sapi.c,v 1.58 2004/12/05 09:52:25 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);
@@ -100,22 +78,28 @@
php_info_print_table_row(2, HTTP Request Line, lpCB-lpszReq);
PUTS(trth colspan=2 bgcolor=\ PHP_HEADER_COLOR \HTTP Headers/th/tr\n);
php_info_print_table_header(2, Server Variable, Value);
- while (*p) {
+
+ /* --- loop over all registered server variables --- */
+ for(; pIter PIDBIterator_atValidElement( pIter ); PIDBIterator_next( pIter ) )
+ {
+ PCHAR pKey;
+ PIDBIterator_current( pIter, pKey );
+ if ( !pKey ) { /* sanity */ continue; };
+
variable_len = PI3WEB_SERVER_VAR_BUF_SIZE;
- if (lpCB-GetServerVariable(lpCB-ConnID, *p, variable_buf, variable_len)
+ if (lpCB-GetServerVariable(lpCB-ConnID, pKey, variable_buf, variable_len)
variable_buf[0]) {
- php_info_print_table_row(2, *p, variable_buf);
+ php_info_print_table_row(2, pKey, variable_buf);
} else if (PIPlatform_getLastError() == PIAPI_EINVAL) {
char *tmp_variable_buf;
tmp_variable_buf = (char *) emalloc(variable_len);
- if (lpCB-GetServerVariable(lpCB-ConnID, *p, tmp_variable_buf, variable_len)
+ if (lpCB-GetServerVariable(lpCB-ConnID, pKey, tmp_variable_buf, variable_len)
variable_buf[0]) {
-php_info_print_table_row(2, *p, tmp_variable_buf);
+php_info_print_table_row(2, pKey, tmp_variable_buf);
}
efree(tmp_variable_buf);
}
- p++;
}
PUTS(/table);
@@ -298,68 +282,38 @@
char static_variable_buf[PI3WEB_SERVER_VAR_BUF_SIZE];
char *variable_buf;
DWORD variable_len = PI3WEB_SERVER_VAR_BUF_SIZE;
- char *variable;
- char *strtok_buf = NULL;
LPCONTROL_BLOCK lpCB = (LPCONTROL_BLOCK) SG(server_context);
- char **p = pi3web_server_variables;
- p++; // Jump over ALL_HTTP;
+ PIDB *pDB = (PIDB *)lpCB-GetVariableNames(lpCB-ConnID);
+ PIDBIterator *pIter = PIDB_getIterator( pDB, PIDBTYPE_STRING, 0, 0 );
+
+ /* --- loop over all registered server variables --- */
+ for(; pIter PIDBIterator_atValidElement( pIter ); PIDBIterator_next( pIter ) )
+ {
+ PCHAR pKey;
+ PIDBIterator_current( pIter, pKey );
+ if ( !pKey ) { /* sanity */ continue; };
- /* Register the standard server variables */
- while (*p) {
variable_len = PI3WEB_SERVER_VAR_BUF_SIZE;
- if (lpCB-GetServerVariable(lpCB-ConnID, *p, static_variable_buf, variable_len)
+ if (lpCB-GetServerVariable(lpCB-ConnID, pKey, static_variable_buf, variable_len)
(variable_len 1)) {
- php_register_variable(*p, static_variable_buf, track_vars_array TSRMLS_CC);
+ php_register_variable(pKey, static_variable_buf, track_vars_array
[PHP-CVS] cvs: php-src(PHP_5_0) /sapi/pi3web php5pi3web.dsp pi3web_sapi.c pi3web_sapi.h
holger Sun Dec 5 05:32:31 2004 EDT
Modified files: (Branch: PHP_5_0)
/php-src/sapi/pi3webpi3web_sapi.c php5pi3web.dsp pi3web_sapi.h
Log:
Replaced static server variables by function call and configurable list at
the Pi3Web server side.
http://cvs.php.net/diff.php/php-src/sapi/pi3web/pi3web_sapi.c?r1=1.57r2=1.57.2.1ty=u
Index: php-src/sapi/pi3web/pi3web_sapi.c
diff -u php-src/sapi/pi3web/pi3web_sapi.c:1.57
php-src/sapi/pi3web/pi3web_sapi.c:1.57.2.1
--- php-src/sapi/pi3web/pi3web_sapi.c:1.57 Sat Jan 17 08:00:15 2004
+++ php-src/sapi/pi3web/pi3web_sapi.c Sun Dec 5 05:32:30 2004
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: pi3web_sapi.c,v 1.57 2004/01/17 13:00:15 sniper Exp $ */
+/* $Id: pi3web_sapi.c,v 1.57.2.1 2004/12/05 10:32:30 holger Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -45,41 +45,19 @@
int IWasLoaded=0;
-static char *pi3web_server_variables[] = {
- ALL_HTTP,
- AUTH_TYPE,
- CONTENT_LENGTH,
- CONTENT_TYPE,
- GATEWAY_INTERFACE,
- PATH_INFO,
- PATH_TRANSLATED,
- QUERY_STRING,
- REQUEST_METHOD,
- REMOTE_ADDR,
- REMOTE_HOST,
- REMOTE_USER,
- SCRIPT_NAME,
- SERVER_NAME,
- SERVER_PORT,
- SERVER_PROTOCOL,
- SERVER_SOFTWARE,
- NULL
-};
-
static void php_info_pi3web(ZEND_MODULE_INFO_FUNC_ARGS)
{
- char **p = pi3web_server_variables;
char variable_buf[PI3WEB_SERVER_VAR_BUF_SIZE];
DWORD variable_len;
- LPCONTROL_BLOCK lpCB;
-
- lpCB = (LPCONTROL_BLOCK) SG(server_context);
+ LPCONTROL_BLOCK lpCB = (LPCONTROL_BLOCK) SG(server_context);
+ PIDB *pDB = (PIDB *)lpCB-GetVariableNames(lpCB-ConnID);
+ PIDBIterator *pIter = PIDB_getIterator( pDB, PIDBTYPE_STRING, 0, 0 );
PUTS(table border=0 cellpadding=3 cellspacing=1 width=600
align=center\n);
PUTS(trth 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.57 2004/01/17 13:00:15 sniper Exp $);
+ php_info_print_table_row(2, Pi3Web SAPI module version, $Id:
pi3web_sapi.c,v 1.57.2.1 2004/12/05 10:32:30 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);
@@ -100,22 +78,28 @@
php_info_print_table_row(2, HTTP Request Line, lpCB-lpszReq);
PUTS(trth colspan=2 bgcolor=\ PHP_HEADER_COLOR \HTTP
Headers/th/tr\n);
php_info_print_table_header(2, Server Variable, Value);
- while (*p) {
+
+ /* --- loop over all registered server variables --- */
+ for(; pIter PIDBIterator_atValidElement( pIter ); PIDBIterator_next(
pIter ) )
+ {
+ PCHAR pKey;
+ PIDBIterator_current( pIter, pKey );
+ if ( !pKey ) { /* sanity */ continue; };
+
variable_len = PI3WEB_SERVER_VAR_BUF_SIZE;
- if (lpCB-GetServerVariable(lpCB-ConnID, *p, variable_buf,
variable_len)
+ if (lpCB-GetServerVariable(lpCB-ConnID, pKey, variable_buf,
variable_len)
variable_buf[0]) {
- php_info_print_table_row(2, *p, variable_buf);
+ php_info_print_table_row(2, pKey, variable_buf);
} else if (PIPlatform_getLastError() == PIAPI_EINVAL) {
char *tmp_variable_buf;
tmp_variable_buf = (char *) emalloc(variable_len);
- if (lpCB-GetServerVariable(lpCB-ConnID, *p,
tmp_variable_buf, variable_len)
+ if (lpCB-GetServerVariable(lpCB-ConnID, pKey,
tmp_variable_buf, variable_len)
variable_buf[0]) {
- php_info_print_table_row(2, *p,
tmp_variable_buf);
+ php_info_print_table_row(2, pKey,
tmp_variable_buf);
}
efree(tmp_variable_buf);
}
- p++;
}
PUTS(/table);
@@ -298,68 +282,38 @@
char static_variable_buf[PI3WEB_SERVER_VAR_BUF_SIZE];
char *variable_buf;
DWORD variable_len = PI3WEB_SERVER_VAR_BUF_SIZE;
- char *variable;
- char *strtok_buf = NULL;
LPCONTROL_BLOCK lpCB = (LPCONTROL_BLOCK) SG(server_context);
- char **p = pi3web_server_variables;
- p++; // Jump over ALL_HTTP;
+ PIDB *pDB = (PIDB *)lpCB-GetVariableNames(lpCB-ConnID);
+ PIDBIterator *pIter = PIDB_getIterator( pDB, PIDBTYPE_STRING, 0, 0 );
+
+ /* --- loop
Re: [PHP-CVS] cvs: php-src /sapi/pi3web php5pi3web.dsp pi3web_sapi.c pi3web_sapi.h
Thanks :) Holger Zimmermann wrote: Will commit into the branch in a few minutes. Sorry, I missed there's a branch point for 5.0. -- regards, Holger Andrey Hristov schrieb: Hi, what about the 5_0 branch? Thanks, Andrey Holger Zimmermann wrote: holgerSun Dec 5 04:52:25 2004 EDT Modified files: /php-src/sapi/pi3web pi3web_sapi.c php5pi3web.dsp pi3web_sapi.h Log: Replaced static server variables by function call and configurable list at the Pi3Web server side. http://cvs.php.net/diff.php/php-src/sapi/pi3web/pi3web_sapi.c?r1=1.57r2=1.58ty=u Index: php-src/sapi/pi3web/pi3web_sapi.c diff -u php-src/sapi/pi3web/pi3web_sapi.c:1.57 php-src/sapi/pi3web/pi3web_sapi.c:1.58 --- php-src/sapi/pi3web/pi3web_sapi.c:1.57Sat Jan 17 08:00:15 2004 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/libxml libxml.c
rrichards Sun Dec 5 06:59:46 2004 EDT Modified files: /php-src/ext/libxml libxml.c Log: define options that can be used when loading documents http://cvs.php.net/diff.php/php-src/ext/libxml/libxml.c?r1=1.24r2=1.25ty=u Index: php-src/ext/libxml/libxml.c diff -u php-src/ext/libxml/libxml.c:1.24 php-src/ext/libxml/libxml.c:1.25 --- php-src/ext/libxml/libxml.c:1.24Tue Nov 9 03:13:35 2004 +++ php-src/ext/libxml/libxml.c Sun Dec 5 06:59:46 2004 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: libxml.c,v 1.24 2004/11/09 08:13:35 dmitry Exp $ */ +/* $Id: libxml.c,v 1.25 2004/12/05 11:59:46 rrichards Exp $ */ #define IS_EXT_MODULE @@ -458,6 +458,20 @@ LIBXML(error_buffer).c = NULL; #endif +#if LIBXML_VERSION = 20600 + /* For use with loading xml */ + REGISTER_LONG_CONSTANT(LIBXML_NOENT, XML_PARSE_NOENT, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT(LIBXML_DTDLOAD,XML_PARSE_DTDLOAD, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT(LIBXML_DTDATTR,XML_PARSE_DTDATTR, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT(LIBXML_DTDVALID, XML_PARSE_DTDVALID, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT(LIBXML_NOERROR,XML_PARSE_NOERROR, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT(LIBXML_NOWARNING, XML_PARSE_NOWARNING, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT(LIBXML_NOBLANKS, XML_PARSE_NOBLANKS, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT(LIBXML_XINCLUDE, XML_PARSE_XINCLUDE, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT(LIBXML_NSCLEAN,XML_PARSE_NSCLEAN, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT(LIBXML_NOCDATA,XML_PARSE_NOCDATA, CONST_CS | CONST_PERSISTENT); +#endif + return SUCCESS; } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dom document.c
rrichards Sun Dec 5 07:01:45 2004 EDT
Modified files:
/php-src/ext/domdocument.c
Log:
add optional parameter to pass libxml document load options
http://cvs.php.net/diff.php/php-src/ext/dom/document.c?r1=1.61r2=1.62ty=u
Index: php-src/ext/dom/document.c
diff -u php-src/ext/dom/document.c:1.61 php-src/ext/dom/document.c:1.62
--- php-src/ext/dom/document.c:1.61 Thu Nov 18 14:54:30 2004
+++ php-src/ext/dom/document.c Sun Dec 5 07:01:44 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: document.c,v 1.61 2004/11/18 19:54:30 rrichards Exp $ */
+/* $Id: document.c,v 1.62 2004/12/05 12:01:44 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1076,6 +1076,7 @@
if (!retnodep) {
RETURN_FALSE;
}
+
}
DOM_RET_OBJ(rv, (xmlNodePtr) retnodep, ret, intern);
@@ -1406,7 +1407,7 @@
/* {{{ */
-static xmlDocPtr dom_document_parser(zval *id, int mode, char *source
TSRMLS_DC) {
+static xmlDocPtr dom_document_parser(zval *id, int mode, char *source, int
options TSRMLS_DC) {
xmlDocPtr ret;
xmlParserCtxtPtr ctxt = NULL;
dom_doc_props *doc_props;
@@ -1435,7 +1436,9 @@
xmlInitParser();
+#if LIBXML_VERSION 20600
keep_blanks = xmlKeepBlanksDefault(keep_blanks);
+#endif
if (mode == DOM_LOAD_FILE) {
char *file_dest = _dom_get_valid_file_path(source,
resolved_path, MAXPATHLEN TSRMLS_CC);
@@ -1447,11 +1450,13 @@
ctxt = xmlCreateDocParserCtxt(source);
}
+#if LIBXML_VERSION 20600
xmlKeepBlanksDefault(keep_blanks);
/* xmlIndentTreeOutput default is changed in xmlKeepBlanksDefault
reset back to 1 which is default value */
xmlIndentTreeOutput = 1;
+#endif
if (ctxt == NULL) {
return(NULL);
@@ -1477,11 +1482,6 @@
}
}
- ctxt-recovery = recover;
- ctxt-validate = validate;
-ctxt-loadsubset = (resolve_externals * XML_COMPLETE_ATTRS);
- ctxt-replaceEntities = substitute_ent;
-
ctxt-vctxt.error = php_libxml_ctx_error;
ctxt-vctxt.warning = php_libxml_ctx_warning;
@@ -1489,15 +1489,40 @@
ctxt-sax-error = php_libxml_ctx_error;
ctxt-sax-warning = php_libxml_ctx_warning;
}
+
+#if LIBXML_VERSION = 20600
+ if (validate ! (options XML_PARSE_DTDVALID)) {
+ options |= XML_PARSE_DTDVALID;
+ }
+ if (resolve_externals ! (options XML_PARSE_DTDATTR)) {
+ options |= XML_PARSE_DTDATTR;
+ }
+ if (substitute_ent ! (options XML_PARSE_NOENT)) {
+ options |= XML_PARSE_NOENT;
+ }
+ if (keep_blanks == 0 ! (options XML_PARSE_NOBLANKS)) {
+ options |= XML_PARSE_NOBLANKS;
+ }
+ if (options 0) {
+ xmlCtxtUseOptions(ctxt, options);
+ }
+#else
+ ctxt-validate = validate;
+ctxt-loadsubset = (resolve_externals * XML_COMPLETE_ATTRS);
+ ctxt-replaceEntities = substitute_ent;
+#endif
+
+ ctxt-recovery = recover;
if (recover) {
old_error_reporting = EG(error_reporting);
EG(error_reporting) = old_error_reporting | E_WARNING;
}
+
xmlParseDocument(ctxt);
if (ctxt-wellFormed || recover) {
ret = ctxt-myDoc;
- if (recover) {
+ if (ctxt-recovery) {
EG(error_reporting) = old_error_reporting;
}
/* If loading from memory, set the base reference uri for the
document */
@@ -1523,14 +1548,14 @@
dom_doc_props *doc_prop;
dom_object *intern;
char *source;
- int source_len, refcount, ret;
+ int source_len, refcount, ret, options = 0;
id = getThis();
if (id != NULL ! instanceof_function(Z_OBJCE_P(id),
dom_document_class_entry TSRMLS_CC)) {
id = NULL;
}
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s, source,
source_len) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|l, source,
source_len, options) == FAILURE) {
return;
}
@@ -1539,7 +1564,7 @@
RETURN_FALSE;
}
- newdoc = dom_document_parser(id, mode, source TSRMLS_CC);
+ newdoc = dom_document_parser(id, mode, source, options TSRMLS_CC);
if (!newdoc)
RETURN_FALSE;
@@ -1572,7 +1597,7 @@
}
/* }}} end dom_parser_document */
-/* {{{ proto DOMNode dom_document_load(string source);
+/* {{{ proto DOMNode dom_document_load(string source [, int options]);
URL: http://www.w3.org/TR/DOM-Level-3-LS/load-save.html#LS-DocumentLS-load
Since: DOM Level 3
*/
@@ -1582,7 +1607,7 @@
}
/* }}} end dom_document_load */
-/* {{{ proto DOMNode
[PHP-CVS] cvs: php-src /ext/simplexml simplexml.c
rrichards Sun Dec 5 07:02:35 2004 EDT
Modified files:
/php-src/ext/simplexml simplexml.c
Log:
add optional parameter to pass libxml document load options
http://cvs.php.net/diff.php/php-src/ext/simplexml/simplexml.c?r1=1.146r2=1.147ty=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.146
php-src/ext/simplexml/simplexml.c:1.147
--- php-src/ext/simplexml/simplexml.c:1.146 Mon Aug 30 13:29:22 2004
+++ php-src/ext/simplexml/simplexml.c Sun Dec 5 07:02:35 2004
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.146 2004/08/30 17:29:22 rrichards Exp $ */
+/* $Id: simplexml.c,v 1.147 2004/12/05 12:02:35 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1260,7 +1260,7 @@
}
/* }}} */
-/* {{{ proto simplemxml_element simplexml_load_file(string filename [, string
class_name])
+/* {{{ proto simplemxml_element simplexml_load_file(string filename [, string
class_name [, int options]])
Load a filename and return a simplexml_element object to allow for
processing */
PHP_FUNCTION(simplexml_load_file)
{
@@ -1269,14 +1269,19 @@
int filename_len;
xmlDocPtr docp;
char *classname = ;
- int classname_len = 0;
+ int classname_len = 0, options=0;
zend_class_entry *ce= sxe_class_entry;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|s, filename,
filename_len, classname, classname_len) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|sl, filename,
filename_len, classname, classname_len, options) == FAILURE) {
return;
}
+#if LIBXML_VERSION = 20600
+ docp = xmlReadFile(filename, NULL, options);
+#else
docp = xmlParseFile(filename);
+#endif
+
if (! docp) {
RETURN_FALSE;
}
@@ -1298,7 +1303,7 @@
}
/* }}} */
-/* {{{ proto simplemxml_element simplexml_load_string(string data [, string
class_name])
+/* {{{ proto simplemxml_element simplexml_load_string(string data [, string
class_name [, int options]])
Load a string and return a simplexml_element object to allow for processing
*/
PHP_FUNCTION(simplexml_load_string)
{
@@ -1307,14 +1312,19 @@
int data_len;
xmlDocPtr docp;
char *classname = ;
- int classname_len = 0;
+ int classname_len = 0, options=0;
zend_class_entry *ce= sxe_class_entry;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|s, data,
data_len, classname, classname_len) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|sl, data,
data_len, classname, classname_len, options) == FAILURE) {
return;
}
+#if LIBXML_VERSION = 20600
+ docp = xmlReadMemory(data, data_len, NULL, NULL, options);
+#else
docp = xmlParseMemory(data, data_len);
+#endif
+
if (! docp) {
RETURN_FALSE;
}
@@ -1719,7 +1729,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.146 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.147 $);
php_info_print_table_row(2, Schema support,
#ifdef LIBXML_SCHEMAS_ENABLED
enabled);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) / EXTENSIONS
iliaa Sun Dec 5 14:08:56 2004 EDT Modified files: (Branch: PHP_4_3) /php-srcEXTENSIONS Log: As per discussion on internals and pecl, domxml is no longer experimental. http://cvs.php.net/diff.php/php-src/EXTENSIONS?r1=1.51.2.7r2=1.51.2.8ty=u Index: php-src/EXTENSIONS diff -u php-src/EXTENSIONS:1.51.2.7 php-src/EXTENSIONS:1.51.2.8 --- php-src/EXTENSIONS:1.51.2.7 Fri Jan 16 11:46:59 2004 +++ php-src/EXTENSIONS Sun Dec 5 14:08:56 2004 @@ -262,7 +262,7 @@ EXTENSION: domxml PRIMARY MAINTAINER: Uwe Steinmann [EMAIL PROTECTED] MAINTENANCE: Maintained -STATUS: Experimental +STATUS: Working --- EXTENSION: dotnet PRIMARY MAINTAINER: Sam Ruby [EMAIL PROTECTED] -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqli mysqli_prop.c
georg Mon Dec 6 00:15:04 2004 EDT
Modified files:
/php-src/ext/mysqli mysqli_prop.c
Log:
fixed windows compile errors (Thx to Sebastian Bergmann)
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_prop.c?r1=1.16r2=1.17ty=u
Index: php-src/ext/mysqli/mysqli_prop.c
diff -u php-src/ext/mysqli/mysqli_prop.c:1.16
php-src/ext/mysqli/mysqli_prop.c:1.17
--- php-src/ext/mysqli/mysqli_prop.c:1.16 Sat Dec 4 03:16:04 2004
+++ php-src/ext/mysqli/mysqli_prop.cMon Dec 6 00:15:03 2004
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_prop.c,v 1.16 2004/12/04 08:16:04 georg Exp $
+ $Id: mysqli_prop.c,v 1.17 2004/12/06 05:15:03 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -37,19 +37,26 @@
} \
#define MYSQLI_GET_MYSQL() \
-MYSQL *p = (MYSQL *)((MY_MYSQL *)((MYSQLI_RESOURCE *)(obj-ptr))-ptr)-mysql;
+MYSQL *p; \
+ALLOC_ZVAL(*retval);\
+CHECK_OBJECT();\
+p = (MYSQL *)((MY_MYSQL *)((MYSQLI_RESOURCE *)(obj-ptr))-ptr)-mysql;
#define MYSQLI_GET_RESULT() \
-MYSQL_RES *p = (MYSQL_RES *)((MYSQLI_RESOURCE *)(obj-ptr))-ptr
+MYSQL_RES *p; \
+ALLOC_ZVAL(*retval);\
+CHECK_OBJECT();\
+p = (MYSQL_RES *)((MYSQLI_RESOURCE *)(obj-ptr))-ptr
#define MYSQLI_GET_STMT() \
-MYSQL_STMT *p = (MYSQL_STMT *)((MY_STMT *)((MYSQLI_RESOURCE
*)(obj-ptr))-ptr)-stmt
+MYSQL_STMT *p; \
+ALLOC_ZVAL(*retval);\
+CHECK_OBJECT();\
+p = (MYSQL_STMT *)((MY_STMT *)((MYSQLI_RESOURCE *)(obj-ptr))-ptr)-stmt
#define MYSQLI_MAP_PROPERTY_FUNC_LONG( __func, __int_func, __get_type,
__ret_type)\
int __func(mysqli_object *obj, zval **retval TSRMLS_DC) \
{\
- ALLOC_ZVAL(*retval); \
- CHECK_OBJECT(); \
__ret_type l;\
__get_type;\
if (!p) {\
@@ -71,8 +78,6 @@
int __func(mysqli_object *obj, zval **retval TSRMLS_DC)\
{\
char *c;\
- ALLOC_ZVAL(*retval); \
- CHECK_OBJECT(); \
__get_type;\
if (!p) {\
ZVAL_NULL(*retval);\
@@ -143,10 +148,11 @@
/* {{{ property result_type_read */
int result_type_read(mysqli_object *obj, zval **retval TSRMLS_DC)
{
+ MYSQL_RES *p;
+
ALLOC_ZVAL(*retval);
CHECK_OBJECT();
-
- MYSQL_RES *p = (MYSQL_RES *)((MYSQLI_RESOURCE *)(obj-ptr))-ptr;
+ p = (MYSQL_RES *)((MYSQLI_RESOURCE *)(obj-ptr))-ptr;
if (!p) {
ZVAL_NULL(*retval);
@@ -160,11 +166,12 @@
/* {{{ property result_lengths_read */
int result_lengths_read(mysqli_object *obj, zval **retval TSRMLS_DC)
{
+ MYSQL_RES *p;
+
ALLOC_ZVAL(*retval);
CHECK_OBJECT();
- MYSQL_RES *p = (MYSQL_RES *)((MYSQLI_RESOURCE *)(obj-ptr))-ptr;
-
+ p = (MYSQL_RES *)((MYSQLI_RESOURCE *)(obj-ptr))-ptr;
if (!p || !p-field_count) {
ZVAL_NULL(*retval);
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /ext/mysqli mysqli_prop.c
georg Mon Dec 6 00:15:36 2004 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/mysqli mysqli_prop.c
Log:
MFH: fixed windows compile errors
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_prop.c?r1=1.14.2.2r2=1.14.2.3ty=u
Index: php-src/ext/mysqli/mysqli_prop.c
diff -u php-src/ext/mysqli/mysqli_prop.c:1.14.2.2
php-src/ext/mysqli/mysqli_prop.c:1.14.2.3
--- php-src/ext/mysqli/mysqli_prop.c:1.14.2.2 Sat Dec 4 04:01:33 2004
+++ php-src/ext/mysqli/mysqli_prop.cMon Dec 6 00:15:36 2004
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_prop.c,v 1.14.2.2 2004/12/04 09:01:33 georg Exp $
+ $Id: mysqli_prop.c,v 1.14.2.3 2004/12/06 05:15:36 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -39,19 +39,26 @@
#define MYSQLI_GET_MYSQL() \
-MYSQL *p = (MYSQL *)((MY_MYSQL *)((MYSQLI_RESOURCE *)(obj-ptr))-ptr)-mysql;
+MYSQL *p; \
+ALLOC_ZVAL(*retval);\
+CHECK_OBJECT(); \
+p = (MYSQL *)((MY_MYSQL *)((MYSQLI_RESOURCE *)(obj-ptr))-ptr)-mysql;
#define MYSQLI_GET_RESULT() \
-MYSQL_RES *p = (MYSQL_RES *)((MYSQLI_RESOURCE *)(obj-ptr))-ptr
+MYSQL_RES *p; \
+ALLOC_ZVAL(*retval);\
+CHECK_OBJECT(); \
+p = (MYSQL_RES *)((MYSQLI_RESOURCE *)(obj-ptr))-ptr
#define MYSQLI_GET_STMT() \
-MYSQL_STMT *p = (MYSQL_STMT *)((MY_STMT *)((MYSQLI_RESOURCE
*)(obj-ptr))-ptr)-stmt
+MYSQL_STMT *p; \
+ALLOC_ZVAL(*retval);\
+CHECK_OBJECT(); \
+p = (MYSQL_STMT *)((MY_STMT *)((MYSQLI_RESOURCE *)(obj-ptr))-ptr)-stmt
#define MYSQLI_MAP_PROPERTY_FUNC_LONG( __func, __int_func, __get_type,
__ret_type)\
int __func(mysqli_object *obj, zval **retval TSRMLS_DC) \
{\
- ALLOC_ZVAL(*retval); \
- CHECK_OBJECT(); \
__ret_type l;\
__get_type;\
if (!p) {\
@@ -73,8 +80,6 @@
int __func(mysqli_object *obj, zval **retval TSRMLS_DC)\
{\
char *c;\
- ALLOC_ZVAL(*retval); \
- CHECK_OBJECT(); \
__get_type;\
if (!p) {\
ZVAL_NULL(*retval);\
@@ -145,10 +150,12 @@
/* {{{ property result_type_read */
int result_type_read(mysqli_object *obj, zval **retval TSRMLS_DC)
{
+ MYSQL_RES *p;
+
ALLOC_ZVAL(*retval);
CHECK_OBJECT();
- MYSQL_RES *p = (MYSQL_RES *)((MYSQLI_RESOURCE *)(obj-ptr))-ptr;
+ p = (MYSQL_RES *)((MYSQLI_RESOURCE *)(obj-ptr))-ptr;
if (!p) {
ZVAL_NULL(*retval);
@@ -162,12 +169,13 @@
/* {{{ property result_lengths_read */
int result_lengths_read(mysqli_object *obj, zval **retval TSRMLS_DC)
{
+ MYSQL_RES *p;
+
ALLOC_ZVAL(*retval);
CHECK_OBJECT();
- MYSQL_RES *p = (MYSQL_RES *)((MYSQLI_RESOURCE *)(obj-ptr))-ptr;
+ p = (MYSQL_RES *)((MYSQLI_RESOURCE *)(obj-ptr))-ptr;
- ALLOC_ZVAL(*retval);
if (!p || !p-field_count) {
ZVAL_NULL(*retval);
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
