Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard info.c
hi Tony! On Sun, Jan 4, 2009 at 4:19 PM, Antony Dovgal tony2...@php.net wrote: tony2001Sun Jan 4 15:19:57 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard info.c Log: MFH Can you add the description as well (for MF*), like MFH: Capitalize It makes reviewing and history check easier. Thanks! Cheers, -- Pierre http://blog.thepimp.net | http://www.libgd.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard info.c
Sure, will do. On 04.01.2009 18:58, Pierre Joye wrote: hi Tony! On Sun, Jan 4, 2009 at 4:19 PM, Antony Dovgal tony2...@php.net wrote: tony2001Sun Jan 4 15:19:57 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard info.c Log: MFH Can you add the description as well (for MF*), like MFH: Capitalize It makes reviewing and history check easier. Thanks! Cheers, -- Wbr, Antony Dovgal -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard info.c
tony2001Sun Jan 4 15:19:57 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard info.c Log: MFH http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.c?r1=1.249.2.10.2.14.2.21r2=1.249.2.10.2.14.2.22diff_format=u Index: php-src/ext/standard/info.c diff -u php-src/ext/standard/info.c:1.249.2.10.2.14.2.21 php-src/ext/standard/info.c:1.249.2.10.2.14.2.22 --- php-src/ext/standard/info.c:1.249.2.10.2.14.2.21Wed Dec 31 13:49:14 2008 +++ php-src/ext/standard/info.c Sun Jan 4 15:19:57 2009 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: info.c,v 1.249.2.10.2.14.2.21 2008/12/31 13:49:14 helly Exp $ */ +/* $Id: info.c,v 1.249.2.10.2.14.2.22 2009/01/04 15:19:57 tony2001 Exp $ */ #include php.h #include php_ini.h @@ -685,7 +685,7 @@ php_info_print_table_row(2, Configuration File (php.ini) Path, PHP_CONFIG_FILE_PATH); php_info_print_table_row(2, Loaded Configuration File, php_ini_opened_path ? php_ini_opened_path : (none)); php_info_print_table_row(2, Scan this dir for additional .ini files, php_ini_scanned_path ? php_ini_scanned_path : (none)); - php_info_print_table_row(2, additional .ini files parsed, php_ini_scanned_files ? php_ini_scanned_files : (none)); + php_info_print_table_row(2, Additional .ini files parsed, php_ini_scanned_files ? php_ini_scanned_files : (none)); snprintf(temp_api, sizeof(temp_api), %d, PHP_API_VERSION); php_info_print_table_row(2, PHP API, temp_api); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard info.c
helly Wed Dec 31 12:52:39 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard info.c
Log:
- MFH Do not show core ini entries twice
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.c?r1=1.249.2.10.2.14.2.19r2=1.249.2.10.2.14.2.20diff_format=u
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.249.2.10.2.14.2.19
php-src/ext/standard/info.c:1.249.2.10.2.14.2.20
--- php-src/ext/standard/info.c:1.249.2.10.2.14.2.19Wed Dec 31 11:15:45 2008
+++ php-src/ext/standard/info.c Wed Dec 31 12:52:39 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: info.c,v 1.249.2.10.2.14.2.19 2008/12/31 11:15:45 sebastian Exp $ */
+/* $Id: info.c,v 1.249.2.10.2.14.2.20 2008/12/31 12:52:39 helly Exp $ */
#include php.h
#include php_ini.h
@@ -883,8 +883,10 @@
} else {
SECTION(Configuration);
}
- SECTION(PHP Core);
- display_ini_entries(NULL);
+ if (!(flag PHP_INFO_MODULES)) {
+ SECTION(PHP Core);
+ display_ini_entries(NULL);
+ }
}
if (flag PHP_INFO_MODULES) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard info.c
helly Wed Dec 31 13:49:14 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard info.c
Log:
- MFH Fix info output
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.c?r1=1.249.2.10.2.14.2.20r2=1.249.2.10.2.14.2.21diff_format=u
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.249.2.10.2.14.2.20
php-src/ext/standard/info.c:1.249.2.10.2.14.2.21
--- php-src/ext/standard/info.c:1.249.2.10.2.14.2.20Wed Dec 31 12:52:39 2008
+++ php-src/ext/standard/info.c Wed Dec 31 13:49:14 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: info.c,v 1.249.2.10.2.14.2.20 2008/12/31 12:52:39 helly Exp $ */
+/* $Id: info.c,v 1.249.2.10.2.14.2.21 2008/12/31 13:49:14 helly Exp $ */
#include php.h
#include php_ini.h
@@ -109,7 +109,7 @@
}
} else {
if (!sapi_module.phpinfo_as_text) {
- php_printf(trtd colspan='2%s/td/tr\n,
zend_module-name);
+ php_printf(trtd%s/td/tr\n, zend_module-name);
} else {
php_printf(%s\n, zend_module-name);
}
@@ -901,7 +901,7 @@
SECTION(Additional Modules);
php_info_print_table_start();
- php_info_print_table_header(2, Module Name);
+ php_info_print_table_header(1, Module Name);
zend_hash_apply(sorted_registry, (apply_func_t)
_display_module_info_def TSRMLS_CC);
php_info_print_table_end();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard info.c
helly Tue Dec 30 19:10:37 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard info.c
Log:
- MFH Show version and ini entries as default module info.
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.c?r1=1.249.2.10.2.14.2.17r2=1.249.2.10.2.14.2.18diff_format=u
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.249.2.10.2.14.2.17
php-src/ext/standard/info.c:1.249.2.10.2.14.2.18
--- php-src/ext/standard/info.c:1.249.2.10.2.14.2.17Tue Dec 30 12:50:16 2008
+++ php-src/ext/standard/info.c Tue Dec 30 19:10:37 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: info.c,v 1.249.2.10.2.14.2.17 2008/12/30 12:50:16 felipe Exp $ */
+/* $Id: info.c,v 1.249.2.10.2.14.2.18 2008/12/30 19:10:37 helly Exp $ */
#include php.h
#include php_ini.h
@@ -89,26 +89,29 @@
}
-PHPAPI void php_info_print_module(zend_module_entry *module TSRMLS_DC) /* {{{
*/
+PHPAPI void php_info_print_module(zend_module_entry *zend_module TSRMLS_DC) /*
{{{ */
{
- if (module-info_func) {
+ if (zend_module-info_func || zend_module-version) {
if (!sapi_module.phpinfo_as_text) {
- php_printf(h2a name=\module_%s\%s/a/h2\n,
module-name, module-name);
+ php_printf(h2a name=\module_%s\%s/a/h2\n,
zend_module-name, zend_module-name);
} else {
php_info_print_table_start();
- php_info_print_table_header(1, module-name);
+ php_info_print_table_header(1, zend_module-name);
php_info_print_table_end();
}
- module-info_func(module TSRMLS_CC);
+ if (zend_module-info_func) {
+ zend_module-info_func(zend_module TSRMLS_CC);
+ } else {
+ php_info_print_table_start();
+ php_info_print_table_row(2, Version,
zend_module-version);
+ php_info_print_table_end();
+ DISPLAY_INI_ENTRIES();
+ }
} else {
if (!sapi_module.phpinfo_as_text) {
- php_printf(tr);
- php_printf(td);
- php_printf(%s, module-name);
- php_printf(/td/tr\n);
+ php_printf(trtd colspan='2%s/td/tr\n,
zend_module-name);
} else {
- php_printf(%s, module-name);
- php_printf(\n);
+ php_printf(%s\n, zend_module-name);
}
}
}
@@ -116,7 +119,7 @@
static int _display_module_info_func(zend_module_entry *module TSRMLS_DC) /*
{{{ */
{
- if (module-info_func) {
+ if (module-info_func || module-version) {
php_info_print_module(module TSRMLS_CC);
}
return ZEND_HASH_APPLY_KEEP;
@@ -125,7 +128,7 @@
static int _display_module_info_def(zend_module_entry *module TSRMLS_DC) /*
{{{ */
{
- if (!module-info_func) {
+ if (!module-info_func !module-version) {
php_info_print_module(module TSRMLS_CC);
}
return ZEND_HASH_APPLY_KEEP;
@@ -896,7 +899,7 @@
SECTION(Additional Modules);
php_info_print_table_start();
- php_info_print_table_header(1, Module Name);
+ php_info_print_table_header(2, Module Name);
zend_hash_apply(sorted_registry, (apply_func_t)
_display_module_info_def TSRMLS_CC);
php_info_print_table_end();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard info.c winver.h
pajoye Tue Dec 9 17:54:01 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard info.c winver.h
Log:
- fix VC6 build
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.c?r1=1.249.2.10.2.14.2.14r2=1.249.2.10.2.14.2.15diff_format=u
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.249.2.10.2.14.2.14
php-src/ext/standard/info.c:1.249.2.10.2.14.2.15
--- php-src/ext/standard/info.c:1.249.2.10.2.14.2.14Mon Dec 8 07:32:14 2008
+++ php-src/ext/standard/info.c Tue Dec 9 17:54:01 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: info.c,v 1.249.2.10.2.14.2.14 2008/12/08 07:32:14 stas Exp $ */
+/* $Id: info.c,v 1.249.2.10.2.14.2.15 2008/12/09 17:54:01 pajoye Exp $ */
#include php.h
#include php_ini.h
@@ -38,6 +38,18 @@
#include sys/utsname.h
#endif
+#ifdef PHP_WIN32
+typedef void (WINAPI *PGNSI)(LPSYSTEM_INFO);
+typedef BOOL (WINAPI *PGPI)(DWORD, DWORD, DWORD, DWORD, PDWORD);
+
+# include winver.h
+
+#if _MSC_VER 1300
+# define OSVERSIONINFOEX php_win_OSVERSIONINFOEX
+#endif
+
+#endif
+
#if HAVE_MBSTRING
#include ext/mbstring/mbstring.h
ZEND_EXTERN_MODULE_GLOBALS(mbstring)
@@ -343,9 +355,9 @@
if ( osvi.dwMajorVersion == 5 osvi.dwMinorVersion == 2 )
{
if (GetSystemMetrics(SM_SERVERR2))
major = Windows Server 2003 R2;
- else if (osvi.wSuiteMask==VER_SUITE_STORAGE_SERVER)
+ else if (osvi.wSuiteMask == VER_SUITE_STORAGE_SERVER)
major = Windows Storage Server 2003;
- else if (osvi.wSuiteMask==VER_SUITE_WH_SERVER)
+ else if (osvi.wSuiteMask == VER_SUITE_WH_SERVER)
major = Windows Home Server;
else if (osvi.wProductType == VER_NT_WORKSTATION
si.wProcessorArchitecture==PROCESSOR_ARCHITECTURE_AMD64) {
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/winver.h?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/standard/winver.h
diff -u php-src/ext/standard/winver.h:1.1.2.1
php-src/ext/standard/winver.h:1.1.2.2
--- php-src/ext/standard/winver.h:1.1.2.1 Mon Dec 8 07:32:14 2008
+++ php-src/ext/standard/winver.h Tue Dec 9 17:54:01 2008
@@ -57,10 +57,20 @@
#define VER_SUITE_BLADE 0x0400
#define VER_SUITE_EMBEDDED_RESTRICTED 0x0800
#define VER_SUITE_SECURITY_APPLIANCE0x1000
-#define VER_SUITE_STORAGE_SERVER0x2000
-#define VER_SUITE_COMPUTE_SERVER0x4000
#endif
+#ifndef VER_SUITE_STORAGE_SERVER
+# define VER_SUITE_STORAGE_SERVER0x2000
+#endif
+
+#ifndef VER_SUITE_COMPUTE_SERVER
+# define VER_SUITE_COMPUTE_SERVER0x4000
+#endif
+/*
+ext\standard\info.c(346) : error C2065: 'VER_SUITE_STORAGE_SERVER' :
undeclared identifier
+ext\standard\info.c(373) : error C2065: 'VER_SUITE_COMPUTE_SERVER' :
undeclared identifier
+*/
+
#ifndef PROCESSOR_ARCHITECTURE_AMD64
#define PROCESSOR_ARCHITECTURE_AMD649
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard info.c winver.h
pajoye Tue Dec 9 17:58:00 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard info.c winver.h
Log:
- double declaration and comments cleanup
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.c?r1=1.249.2.10.2.14.2.15r2=1.249.2.10.2.14.2.16diff_format=u
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.249.2.10.2.14.2.15
php-src/ext/standard/info.c:1.249.2.10.2.14.2.16
--- php-src/ext/standard/info.c:1.249.2.10.2.14.2.15Tue Dec 9 17:54:01 2008
+++ php-src/ext/standard/info.c Tue Dec 9 17:57:59 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: info.c,v 1.249.2.10.2.14.2.15 2008/12/09 17:54:01 pajoye Exp $ */
+/* $Id: info.c,v 1.249.2.10.2.14.2.16 2008/12/09 17:57:59 pajoye Exp $ */
#include php.h
#include php_ini.h
@@ -252,15 +252,6 @@
#ifdef PHP_WIN32
/* {{{ */
-typedef void (WINAPI *PGNSI)(LPSYSTEM_INFO);
-typedef BOOL (WINAPI *PGPI)(DWORD, DWORD, DWORD, DWORD, PDWORD);
-
-#include winver.h
-
-#if _MSC_VER 1300
-#define OSVERSIONINFOEX php_win_OSVERSIONINFOEX
-#endif
-
char* php_get_windows_name()
{
OSVERSIONINFOEX osvi;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/winver.h?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/standard/winver.h
diff -u php-src/ext/standard/winver.h:1.1.2.2
php-src/ext/standard/winver.h:1.1.2.3
--- php-src/ext/standard/winver.h:1.1.2.2 Tue Dec 9 17:54:01 2008
+++ php-src/ext/standard/winver.h Tue Dec 9 17:57:59 2008
@@ -66,10 +66,6 @@
#ifndef VER_SUITE_COMPUTE_SERVER
# define VER_SUITE_COMPUTE_SERVER0x4000
#endif
-/*
-ext\standard\info.c(346) : error C2065: 'VER_SUITE_STORAGE_SERVER' :
undeclared identifier
-ext\standard\info.c(373) : error C2065: 'VER_SUITE_COMPUTE_SERVER' :
undeclared identifier
-*/
#ifndef PROCESSOR_ARCHITECTURE_AMD64
#define PROCESSOR_ARCHITECTURE_AMD649
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard info.c winver.h
stasMon Dec 8 07:32:14 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/standard winver.h
Modified files:
/php-src/ext/standard info.c
Log:
improve Windows version detection
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.c?r1=1.249.2.10.2.14.2.13r2=1.249.2.10.2.14.2.14diff_format=u
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.249.2.10.2.14.2.13
php-src/ext/standard/info.c:1.249.2.10.2.14.2.14
--- php-src/ext/standard/info.c:1.249.2.10.2.14.2.13Tue Oct 21 22:08:37 2008
+++ php-src/ext/standard/info.c Mon Dec 8 07:32:14 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: info.c,v 1.249.2.10.2.14.2.13 2008/10/21 22:08:37 lbarnaud Exp $ */
+/* $Id: info.c,v 1.249.2.10.2.14.2.14 2008/12/08 07:32:14 stas Exp $ */
#include php.h
#include php_ini.h
@@ -238,6 +238,220 @@
/* }}} */
+#ifdef PHP_WIN32
+/* {{{ */
+typedef void (WINAPI *PGNSI)(LPSYSTEM_INFO);
+typedef BOOL (WINAPI *PGPI)(DWORD, DWORD, DWORD, DWORD, PDWORD);
+
+#include winver.h
+
+#if _MSC_VER 1300
+#define OSVERSIONINFOEX php_win_OSVERSIONINFOEX
+#endif
+
+char* php_get_windows_name()
+{
+ OSVERSIONINFOEX osvi;
+ SYSTEM_INFO si;
+ PGNSI pGNSI;
+ PGPI pGPI;
+ BOOL bOsVersionInfoEx;
+ DWORD dwType;
+ char *major = NULL, *sub = NULL, *retval;
+
+ ZeroMemory(si, sizeof(SYSTEM_INFO));
+ ZeroMemory(osvi, sizeof(OSVERSIONINFOEX));
+ osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
+
+ if (!(bOsVersionInfoEx = GetVersionEx ((OSVERSIONINFO *) osvi))) {
+ return NULL;
+ }
+
+ pGNSI = (PGNSI) GetProcAddress(GetModuleHandle(kernel32.dll),
GetNativeSystemInfo);
+ if(NULL != pGNSI) {
+ pGNSI(si);
+ } else {
+ GetSystemInfo(si);
+ }
+
+ if (VER_PLATFORM_WIN32_NT==osvi.dwPlatformId osvi.dwMajorVersion 4
) {
+ if (osvi.dwMajorVersion == 6 osvi.dwMinorVersion == 0 )
{
+ if (osvi.wProductType == VER_NT_WORKSTATION) {
+ major = Windows Vista;
+ } else {
+ major = Windows Server 2008;
+ }
+
+ pGPI = (PGPI)
GetProcAddress(GetModuleHandle(kernel32.dll), GetProductInfo);
+ pGPI(6, 0, 0, 0, dwType);
+
+ switch (dwType) {
+ case PRODUCT_ULTIMATE:
+ sub = Ultimate Edition;
+ break;
+ case PRODUCT_HOME_PREMIUM:
+ sub = Home Premium Edition;
+ break;
+ case PRODUCT_HOME_BASIC:
+ sub = Home Basic Edition;
+ break;
+ case PRODUCT_ENTERPRISE:
+ sub = Enterprise Edition;
+ break;
+ case PRODUCT_BUSINESS:
+ sub = Business Edition;
+ break;
+ case PRODUCT_STARTER:
+ sub = Starter Edition;
+ break;
+ case PRODUCT_CLUSTER_SERVER:
+ sub = Cluster Server Edition;
+ break;
+ case PRODUCT_DATACENTER_SERVER:
+ sub = Datacenter Edition;
+ break;
+ case PRODUCT_DATACENTER_SERVER_CORE:
+ sub = Datacenter Edition (core
installation);
+ break;
+ case PRODUCT_ENTERPRISE_SERVER:
+ sub = Enterprise Edition;
+ break;
+ case PRODUCT_ENTERPRISE_SERVER_CORE:
+ sub = Enterprise Edition (core
installation);
+ break;
+ case PRODUCT_ENTERPRISE_SERVER_IA64:
+ sub = Enterprise Edition for
Itanium-based Systems;
+ break;
+ case PRODUCT_SMALLBUSINESS_SERVER:
+ sub = Small Business Server;
+ break;
+ case PRODUCT_SMALLBUSINESS_SERVER_PREMIUM:
+
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard info.c streamsfuncs.c
tony2001Thu Oct 2 08:46:16 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard info.c streamsfuncs.c
Log:
MFH: use HashPosition to prevent race condition in multithreaded env
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.c?r1=1.249.2.10.2.14.2.11r2=1.249.2.10.2.14.2.12diff_format=u
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.249.2.10.2.14.2.11
php-src/ext/standard/info.c:1.249.2.10.2.14.2.12
--- php-src/ext/standard/info.c:1.249.2.10.2.14.2.11Wed Aug 13 00:53:28 2008
+++ php-src/ext/standard/info.c Thu Oct 2 08:46:16 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: info.c,v 1.249.2.10.2.14.2.11 2008/08/13 00:53:28 jani Exp $ */
+/* $Id: info.c,v 1.249.2.10.2.14.2.12 2008/10/02 08:46:16 tony2001 Exp $ */
#include php.h
#include php_ini.h
@@ -528,9 +528,10 @@
ulong num_key;
if ((url_stream_wrappers_hash =
php_stream_get_url_stream_wrappers_hash())) {
- for
(zend_hash_internal_pointer_reset(url_stream_wrappers_hash);
-
zend_hash_get_current_key_ex(url_stream_wrappers_hash, stream_protocol, (uint
*)stream_protocol_len, num_key, 0, NULL) == HASH_KEY_IS_STRING;
-
zend_hash_move_forward(url_stream_wrappers_hash)) {
+ HashPosition pos;
+ for
(zend_hash_internal_pointer_reset_ex(url_stream_wrappers_hash, pos);
+
zend_hash_get_current_key_ex(url_stream_wrappers_hash, stream_protocol, (uint
*)stream_protocol_len, num_key, 0, pos) == HASH_KEY_IS_STRING;
+
zend_hash_move_forward_ex(url_stream_wrappers_hash, pos)) {
stream_protocols_buf =
erealloc(stream_protocols_buf, stream_protocols_buf_len + stream_protocol_len +
2 + 1);
memcpy(stream_protocols_buf +
stream_protocols_buf_len, stream_protocol, stream_protocol_len - 1);
stream_protocols_buf[stream_protocols_buf_len + stream_protocol_len - 1] = ',';
@@ -559,9 +560,10 @@
ulong num_key;
if ((stream_xport_hash = php_stream_xport_get_hash())) {
-
for(zend_hash_internal_pointer_reset(stream_xport_hash);
-
zend_hash_get_current_key_ex(stream_xport_hash, xport_name, (uint
*)xport_name_len, num_key, 0, NULL) == HASH_KEY_IS_STRING;
-
zend_hash_move_forward(stream_xport_hash)) {
+ HashPosition pos;
+
for(zend_hash_internal_pointer_reset_ex(stream_xport_hash, pos);
+
zend_hash_get_current_key_ex(stream_xport_hash, xport_name, (uint
*)xport_name_len, num_key, 0, pos) == HASH_KEY_IS_STRING;
+
zend_hash_move_forward_ex(stream_xport_hash, pos)) {
if (xport_buf_len + xport_name_len + 2
xport_buf_size) {
while (xport_buf_len +
xport_name_len + 2 xport_buf_size) {
xport_buf_size += 256;
@@ -600,9 +602,10 @@
ulong num_key;
if ((stream_filter_hash =
php_get_stream_filters_hash())) {
-
for(zend_hash_internal_pointer_reset(stream_filter_hash);
-
zend_hash_get_current_key_ex(stream_filter_hash, filter_name, (uint
*)filter_name_len, num_key, 0, NULL) == HASH_KEY_IS_STRING;
-
zend_hash_move_forward(stream_filter_hash)) {
+ HashPosition pos;
+
for(zend_hash_internal_pointer_reset_ex(stream_filter_hash, pos);
+
zend_hash_get_current_key_ex(stream_filter_hash, filter_name, (uint
*)filter_name_len, num_key, 0, pos) == HASH_KEY_IS_STRING;
+
zend_hash_move_forward_ex(stream_filter_hash, pos)) {
if (filter_buf_len + filter_name_len +
2 filter_buf_size) {
while (filter_buf_len +
filter_name_len + 2 filter_buf_size) {
filter_buf_size += 256;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.58.2.6.2.15.2.21r2=1.58.2.6.2.15.2.22diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.21
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard info.c /ext/standard/tests/general_functions phpinfo.phpt
tony2001Tue Jul 8 08:37:56 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard info.c /php-src/ext/standard/tests/general_functions phpinfo.phpt Log: capitalize multibyte support http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.c?r1=1.249.2.10.2.14.2.9r2=1.249.2.10.2.14.2.10diff_format=u Index: php-src/ext/standard/info.c diff -u php-src/ext/standard/info.c:1.249.2.10.2.14.2.9 php-src/ext/standard/info.c:1.249.2.10.2.14.2.10 --- php-src/ext/standard/info.c:1.249.2.10.2.14.2.9 Mon Jul 7 01:25:53 2008 +++ php-src/ext/standard/info.c Tue Jul 8 08:37:56 2008 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: info.c,v 1.249.2.10.2.14.2.9 2008/07/07 01:25:53 sfox Exp $ */ +/* $Id: info.c,v 1.249.2.10.2.14.2.10 2008/07/08 08:37:56 tony2001 Exp $ */ #include php.h #include php_ini.h @@ -515,9 +515,9 @@ php_info_print_table_row(2, Zend Memory Manager, is_zend_mm(TSRMLS_C) ? enabled : disabled ); #ifdef ZEND_MULTIBYTE - php_info_print_table_row(2, Zend multibyte support, enabled); + php_info_print_table_row(2, Zend Multibyte Support, enabled); #else - php_info_print_table_row(2, Zend multibyte support, disabled); + php_info_print_table_row(2, Zend Multibyte Support, disabled); #endif #if HAVE_IPV6 http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/phpinfo.phpt?r1=1.1.2.2.2.2r2=1.1.2.2.2.3diff_format=u Index: php-src/ext/standard/tests/general_functions/phpinfo.phpt diff -u php-src/ext/standard/tests/general_functions/phpinfo.phpt:1.1.2.2.2.2 php-src/ext/standard/tests/general_functions/phpinfo.phpt:1.1.2.2.2.3 --- php-src/ext/standard/tests/general_functions/phpinfo.phpt:1.1.2.2.2.2 Thu Jul 3 09:46:10 2008 +++ php-src/ext/standard/tests/general_functions/phpinfo.phpt Tue Jul 8 08:37:56 2008 @@ -31,7 +31,7 @@ Debug Build = %s Thread Safety = %s Zend Memory Manager = %s -Zend multibyte support = %s +Zend Multibyte Support = %s IPv6 Support = %s Registered PHP Streams = %s Registered Stream Socket Transports = %s -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard info.c
Good luck figuring out the info with different compilers..and which
architecture you want there? Host, build or target?
IMO, this needs too much work to get working properly so count me out.
--Jani
Steph Fox wrote:
sfoxMon Jul 7 01:25:53 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard info.c
Log:
- Don't do stuff twice over
@Jani: pick up mail!
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.c?r1=1.249.2.10.2.14.2.8r2=1.249.2.10.2.14.2.9diff_format=u
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.249.2.10.2.14.2.8
php-src/ext/standard/info.c:1.249.2.10.2.14.2.9
--- php-src/ext/standard/info.c:1.249.2.10.2.14.2.8 Thu Jul 3 08:06:55 2008
+++ php-src/ext/standard/info.c Mon Jul 7 01:25:53 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: info.c,v 1.249.2.10.2.14.2.8 2008/07/03 08:06:55 tony2001 Exp $ */
+/* $Id: info.c,v 1.249.2.10.2.14.2.9 2008/07/07 01:25:53 sfox Exp $ */
#include php.h
#include php_ini.h
@@ -48,18 +48,6 @@
ZEND_EXTERN_MODULE_GLOBALS(iconv)
#endif
-#if _MSC_VER = 1500
-# define PHP_WINAPI_COMPILER MSVC9 (2008)
-#elif _MSC_VER = 1400
-# define PHP_WINAPI_COMPILER MSVC8 (2005)
-#elif _MSC_VER = 1310
-# define PHP_WINAPI_COMPILER MSVC7.1 (.NET 2003)
-#elif _MSC_VER = 1300
-# define PHP_WINAPI_COMPILER MSVC7 (.NET 2002)
-#elif _MSC_VER 1300
-# define PHP_WINAPI_COMPILER MSVC6
-#endif
-
#define SECTION(name) if (!sapi_module.phpinfo_as_text) { \
PUTS(h2 name
/h2\n); \
} else { \
@@ -473,15 +461,16 @@
php_info_print_table_start();
php_info_print_table_row(2, System, php_uname );
php_info_print_table_row(2, Build Date, __DATE__ __TIME__
);
+#ifdef COMPILER
+ php_info_print_table_row(2, Compiler, COMPILER);
+#endif
+#ifdef ARCHITECTURE
+ php_info_print_table_row(2, Architecture, ARCHITECTURE);
+#endif
#ifdef CONFIGURE_COMMAND
php_info_print_table_row(2, Configure Command,
CONFIGURE_COMMAND );
#endif
-
-#ifdef PHP_WIN32
- php_info_print_table_row(2, Windows Compiler and Version,
PHP_WINAPI_COMPILER );
-#endif
-
if (sapi_module.pretty_name) {
php_info_print_table_row(2, Server API,
sapi_module.pretty_name );
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard info.c
On Mon, Jul 7, 2008 at 3:25 AM, Steph Fox [EMAIL PROTECTED] wrote:
sfoxMon Jul 7 01:25:53 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard info.c
Log:
- Don't do stuff twice over
@Jani: pick up mail!
What are you doing here? Can you please revert this commit asap, thanks.
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.c?r1=1.249.2.10.2.14.2.8r2=1.249.2.10.2.14.2.9diff_format=u
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.249.2.10.2.14.2.8
php-src/ext/standard/info.c:1.249.2.10.2.14.2.9
--- php-src/ext/standard/info.c:1.249.2.10.2.14.2.8 Thu Jul 3 08:06:55
2008
+++ php-src/ext/standard/info.c Mon Jul 7 01:25:53 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: info.c,v 1.249.2.10.2.14.2.8 2008/07/03 08:06:55 tony2001 Exp $ */
+/* $Id: info.c,v 1.249.2.10.2.14.2.9 2008/07/07 01:25:53 sfox Exp $ */
#include php.h
#include php_ini.h
@@ -48,18 +48,6 @@
ZEND_EXTERN_MODULE_GLOBALS(iconv)
#endif
-#if _MSC_VER = 1500
-# define PHP_WINAPI_COMPILER MSVC9 (2008)
-#elif _MSC_VER = 1400
-# define PHP_WINAPI_COMPILER MSVC8 (2005)
-#elif _MSC_VER = 1310
-# define PHP_WINAPI_COMPILER MSVC7.1 (.NET 2003)
-#elif _MSC_VER = 1300
-# define PHP_WINAPI_COMPILER MSVC7 (.NET 2002)
-#elif _MSC_VER 1300
-# define PHP_WINAPI_COMPILER MSVC6
-#endif
-
#define SECTION(name) if (!sapi_module.phpinfo_as_text) { \
PUTS(h2 name
/h2\n); \
} else { \
@@ -473,15 +461,16 @@
php_info_print_table_start();
php_info_print_table_row(2, System, php_uname );
php_info_print_table_row(2, Build Date, __DATE__
__TIME__ );
+#ifdef COMPILER
+ php_info_print_table_row(2, Compiler, COMPILER);
+#endif
+#ifdef ARCHITECTURE
+ php_info_print_table_row(2, Architecture, ARCHITECTURE);
+#endif
#ifdef CONFIGURE_COMMAND
php_info_print_table_row(2, Configure Command,
CONFIGURE_COMMAND );
#endif
-
-#ifdef PHP_WIN32
- php_info_print_table_row(2, Windows Compiler and Version,
PHP_WINAPI_COMPILER );
-#endif
-
if (sapi_module.pretty_name) {
php_info_print_table_row(2, Server API,
sapi_module.pretty_name );
}
--
Pierre
http://blog.thepimp.net | http://www.libgd.org
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard info.c
Pierre,
What are you doing here? Can you please revert this commit asap, thanks.
Please look at the code before reacting, this is actually the proper way to
do it ('proper' as in, this is the way all the other build-specific
information reaches phpinfo()).
Thanks,
- Steph
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard info.c
Hi Jani, Good luck figuring out the info with different compilers.. You're saying the build system doesn't know it? and which architecture you want there? Host, build or target? Good question. Which does PHP use to determine a 64-bit or 32-bit build? IMO, this needs too much work to get working properly so count me out. So we can't even know if it's gcc or not, and if so which version? Weird, the build system does. If the info isn't available it's simply not reported. The constants could equally well be set to 'unknown' if that's problematic. - Steph -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard info.c
sfoxMon Jul 7 01:25:53 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard info.c
Log:
- Don't do stuff twice over
@Jani: pick up mail!
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.c?r1=1.249.2.10.2.14.2.8r2=1.249.2.10.2.14.2.9diff_format=u
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.249.2.10.2.14.2.8
php-src/ext/standard/info.c:1.249.2.10.2.14.2.9
--- php-src/ext/standard/info.c:1.249.2.10.2.14.2.8 Thu Jul 3 08:06:55 2008
+++ php-src/ext/standard/info.c Mon Jul 7 01:25:53 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: info.c,v 1.249.2.10.2.14.2.8 2008/07/03 08:06:55 tony2001 Exp $ */
+/* $Id: info.c,v 1.249.2.10.2.14.2.9 2008/07/07 01:25:53 sfox Exp $ */
#include php.h
#include php_ini.h
@@ -48,18 +48,6 @@
ZEND_EXTERN_MODULE_GLOBALS(iconv)
#endif
-#if _MSC_VER = 1500
-# define PHP_WINAPI_COMPILER MSVC9 (2008)
-#elif _MSC_VER = 1400
-# define PHP_WINAPI_COMPILER MSVC8 (2005)
-#elif _MSC_VER = 1310
-# define PHP_WINAPI_COMPILER MSVC7.1 (.NET 2003)
-#elif _MSC_VER = 1300
-# define PHP_WINAPI_COMPILER MSVC7 (.NET 2002)
-#elif _MSC_VER 1300
-# define PHP_WINAPI_COMPILER MSVC6
-#endif
-
#define SECTION(name) if (!sapi_module.phpinfo_as_text) { \
PUTS(h2 name
/h2\n); \
} else { \
@@ -473,15 +461,16 @@
php_info_print_table_start();
php_info_print_table_row(2, System, php_uname );
php_info_print_table_row(2, Build Date, __DATE__ __TIME__
);
+#ifdef COMPILER
+ php_info_print_table_row(2, Compiler, COMPILER);
+#endif
+#ifdef ARCHITECTURE
+ php_info_print_table_row(2, Architecture, ARCHITECTURE);
+#endif
#ifdef CONFIGURE_COMMAND
php_info_print_table_row(2, Configure Command,
CONFIGURE_COMMAND );
#endif
-
-#ifdef PHP_WIN32
- php_info_print_table_row(2, Windows Compiler and Version,
PHP_WINAPI_COMPILER );
-#endif
-
if (sapi_module.pretty_name) {
php_info_print_table_row(2, Server API,
sapi_module.pretty_name );
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard info.c
tony2001Thu Jul 3 08:06:55 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard info.c Log: add a line to phpinfo() to indicate whether multibyte support is On or Off http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.c?r1=1.249.2.10.2.14.2.7r2=1.249.2.10.2.14.2.8diff_format=u Index: php-src/ext/standard/info.c diff -u php-src/ext/standard/info.c:1.249.2.10.2.14.2.7 php-src/ext/standard/info.c:1.249.2.10.2.14.2.8 --- php-src/ext/standard/info.c:1.249.2.10.2.14.2.7 Fri Jun 20 14:53:57 2008 +++ php-src/ext/standard/info.c Thu Jul 3 08:06:55 2008 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: info.c,v 1.249.2.10.2.14.2.7 2008/06/20 14:53:57 felipe Exp $ */ +/* $Id: info.c,v 1.249.2.10.2.14.2.8 2008/07/03 08:06:55 tony2001 Exp $ */ #include php.h #include php_ini.h @@ -525,6 +525,12 @@ php_info_print_table_row(2, Zend Memory Manager, is_zend_mm(TSRMLS_C) ? enabled : disabled ); +#ifdef ZEND_MULTIBYTE + php_info_print_table_row(2, Zend multibyte support, enabled); +#else + php_info_print_table_row(2, Zend multibyte support, disabled); +#endif + #if HAVE_IPV6 php_info_print_table_row(2, IPv6 Support, enabled ); #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_3) /ext/standard info.c
iliaa Sun Mar 2 15:35:05 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard info.c Log: Fixed bug #44306 (Better detection of MIPS processors on Windows) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.c?r1=1.249.2.10.2.14.2.2r2=1.249.2.10.2.14.2.3diff_format=u Index: php-src/ext/standard/info.c diff -u php-src/ext/standard/info.c:1.249.2.10.2.14.2.2 php-src/ext/standard/info.c:1.249.2.10.2.14.2.3 --- php-src/ext/standard/info.c:1.249.2.10.2.14.2.2 Mon Dec 31 07:17:15 2007 +++ php-src/ext/standard/info.c Sun Mar 2 15:35:05 2008 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: info.c,v 1.249.2.10.2.14.2.2 2007/12/31 07:17:15 sebastian Exp $ */ +/* $Id: info.c,v 1.249.2.10.2.14.2.3 2008/03/02 15:35:05 iliaa Exp $ */ #include php.h #include php_ini.h @@ -277,7 +277,7 @@ php_uname = tmp_uname; break; case PROCESSOR_ARCHITECTURE_MIPS : - php_uname = MIPS R4000; + snprintf(tmp_uname, sizeof(tmp_uname), MIPS R%d000, SysInfo.wProcessorLevel); php_uname = tmp_uname; break; case PROCESSOR_ARCHITECTURE_ALPHA : -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
