subject:"\[PHP\-CVS\] cvs\: php\-src\(PHP_5_2\) \/ NEWS \/ext\/standard info.c"

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/standard info.c

2008-03-05 Thread Pierre-Alain Joye

pajoye  Wed Mar  5 21:09:29 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
/php-src/ext/standard   info.c 
  Log:
  - #40013, php_uname() does not return nodename on Netware (Guenter Knauf)
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1108r2=1.2027.2.547.2.1109diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1108 php-src/NEWS:1.2027.2.547.2.1109
--- php-src/NEWS:1.2027.2.547.2.1108Wed Mar  5 20:58:08 2008
+++ php-src/NEWSWed Mar  5 21:09:29 2008
@@ -10,6 +10,8 @@
   (Ilia)
 - Fixed bug #42505 (new sendmail default breaks on Netware platform) 
   (Guenter Knauf)
+- Fixed bug #40013 (php_uname() does not return nodename on Netware
+  (Guenter Knauf)
 
 27 Feb 2008, PHP 5.2.6RC1
 - Fixed security issue detailed in CVE-2008-0599. (Rasmus)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.c?r1=1.249.2.10.2.16r2=1.249.2.10.2.17diff_format=u
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.249.2.10.2.16 
php-src/ext/standard/info.c:1.249.2.10.2.17
--- php-src/ext/standard/info.c:1.249.2.10.2.16 Sun Mar  2 15:36:09 2008
+++ php-src/ext/standard/info.c Wed Mar  5 21:09:29 2008
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: info.c,v 1.249.2.10.2.16 2008/03/02 15:36:09 iliaa Exp $ */
+/* $Id: info.c,v 1.249.2.10.2.17 2008/03/05 21:09:29 pajoye Exp $ */
 
 #include php.h
 #include php_ini.h
@@ -326,6 +326,30 @@
if (uname((struct utsname *)buf) == -1) {
php_uname = PHP_UNAME;
} else {
+#ifdef NETWARE
+   if (mode == 's') {
+   php_uname = buf.sysname;
+   } else if (mode == 'r') {
+   snprintf(tmp_uname, sizeof(tmp_uname), %d.%d.%d, 
+buf.netware_major, buf.netware_minor, 
buf.netware_revision);
+   php_uname = tmp_uname;
+   } else if (mode == 'n') {
+   php_uname = buf.servername;
+   } else if (mode == 'v') {
+   snprintf(tmp_uname, sizeof(tmp_uname), libc-%d.%d.%d 
#%d,
+buf.libmajor, buf.libminor, 
buf.librevision, buf.libthreshold);
+   php_uname = tmp_uname;
+   } else if (mode == 'm') {
+   php_uname = buf.machine;
+   } else { /* assume mode == 'a' */
+   snprintf(tmp_uname, sizeof(tmp_uname), %s %s %d.%d.%d 
libc-%d.%d.%d #%d %s,
+buf.sysname, buf.servername,
+buf.netware_major, buf.netware_minor, 
buf.netware_revision,
+buf.libmajor, buf.libminor, 
buf.librevision, buf.libthreshold,
+buf.machine);
+   php_uname = tmp_uname;
+   }
+#else
if (mode == 's') {
php_uname = buf.sysname;
} else if (mode == 'r') {
@@ -342,6 +366,7 @@
 buf.machine);
php_uname = tmp_uname;
}
+#endif /* NETWARE */
}
 #else
php_uname = PHP_UNAME;



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/standard info.c

2008-03-02 Thread Ilia Alshanetsky

iliaa   Sun Mar  2 15:36:10 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard   info.c 
/php-srcNEWS 
  Log:
  
  MFB: 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.15r2=1.249.2.10.2.16diff_format=u
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.249.2.10.2.15 
php-src/ext/standard/info.c:1.249.2.10.2.16
--- php-src/ext/standard/info.c:1.249.2.10.2.15 Mon Dec 31 07:20:12 2007
+++ php-src/ext/standard/info.c Sun Mar  2 15:36:09 2008
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: info.c,v 1.249.2.10.2.15 2007/12/31 07:20:12 sebastian Exp $ */
+/* $Id: info.c,v 1.249.2.10.2.16 2008/03/02 15:36:09 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 :
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1102r2=1.2027.2.547.2.1103diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1102 php-src/NEWS:1.2027.2.547.2.1103
--- php-src/NEWS:1.2027.2.547.2.1102Thu Feb 28 00:35:26 2008
+++ php-src/NEWSSun Mar  2 15:36:09 2008
@@ -1,6 +1,7 @@
 PHPNEWS
 |||
 ?? Mar 2008, PHP 5.2.6
+- Fixed bug #44306 (Better detection of MIPS processors on Windows). (Ilia)
 
 27 Feb 2008, PHP 5.2.6RC1
 - Fixed security issue detailed in CVE-2008-0599. (Rasmus)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/standard info.c info.h /sapi/cli php.1.in php_cli.c

2007-02-08 Thread Marcus Boerger

helly   Thu Feb  8 16:55:34 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
/php-src/ext/standard   info.c info.h 
/php-src/sapi/cli   php.1.in php_cli.c 
  Log:
  - MFH php --ri extension
  http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.523r2=1.2027.2.547.2.524diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.523 php-src/NEWS:1.2027.2.547.2.524
--- php-src/NEWS:1.2027.2.547.2.523 Wed Feb  7 01:01:37 2007
+++ php-src/NEWSThu Feb  8 16:55:34 2007
@@ -1,6 +1,7 @@
 PHPNEWS
 |||
 ?? ??? 2007, PHP 5.2.2
+- Add --ri switch to CLI which allows to check extension information. (Marcus)
 
 08 Feb 2007, PHP 5.2.1
 - Added read-timeout context option timeout for HTTP streams. (Hannes, 
Ilia). 
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.c?r1=1.249.2.10.2.9r2=1.249.2.10.2.10diff_format=u
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.249.2.10.2.9 
php-src/ext/standard/info.c:1.249.2.10.2.10
--- php-src/ext/standard/info.c:1.249.2.10.2.9  Fri Jan 26 15:33:18 2007
+++ php-src/ext/standard/info.c Thu Feb  8 16:55:34 2007
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: info.c,v 1.249.2.10.2.9 2007/01/26 15:33:18 tony2001 Exp $ */
+/* $Id: info.c,v 1.249.2.10.2.10 2007/02/08 16:55:34 helly Exp $ */
 
 #include php.h
 #include php_ini.h
@@ -76,13 +76,9 @@
 }
 
 
-/* {{{ _display_module_info
- */
-static int _display_module_info(zend_module_entry *module, void *arg TSRMLS_DC)
+PHPAPI void php_info_print_module(zend_module_entry *module TSRMLS_DC) /* {{{ 
*/
 {
-   int show_info_func = *((int *) arg);
-
-   if (show_info_func  module-info_func) {
+   if (module-info_func) {
if (!sapi_module.phpinfo_as_text) {
php_printf(h2a name=\module_%s\%s/a/h2\n, 
module-name, module-name);
} else {
@@ -91,7 +87,7 @@
php_info_print_table_end();
}
module-info_func(module TSRMLS_CC);
-   } else if (!show_info_func  !module-info_func) {
+   } else {
if (!sapi_module.phpinfo_as_text) {
php_printf(tr);
php_printf(td);
@@ -102,7 +98,24 @@
php_printf(\n);
}   
}
-   return 0;
+}
+/* }}} */
+
+static int _display_module_info_func(zend_module_entry *module TSRMLS_DC) /* 
{{{ */
+{
+   if (module-info_func) {
+   php_info_print_module(module TSRMLS_CC);
+   }
+   return ZEND_HASH_APPLY_KEEP;
+}
+/* }}} */
+
+static int _display_module_info_def(zend_module_entry *module TSRMLS_DC) /* 
{{{ */
+{
+   if (!module-info_func) {
+   php_info_print_module(module TSRMLS_CC);
+   }
+   return ZEND_HASH_APPLY_KEEP;
 }
 /* }}} */
 
@@ -662,22 +675,19 @@
}
 
if (flag  PHP_INFO_MODULES) {
-   int show_info_func;
HashTable sorted_registry;
zend_module_entry tmp;
 
-   zend_hash_init(sorted_registry, 50, NULL, NULL, 1);
+   zend_hash_init(sorted_registry, 
zend_hash_num_elements(module_registry), NULL, NULL, 1);
zend_hash_copy(sorted_registry, module_registry, NULL, tmp, 
sizeof(zend_module_entry));
zend_hash_sort(sorted_registry, zend_qsort, module_name_cmp, 0 
TSRMLS_CC);
 
-   show_info_func = 1;
-   zend_hash_apply_with_argument(sorted_registry, 
(apply_func_arg_t) _display_module_info, show_info_func TSRMLS_CC);
+   zend_hash_apply(sorted_registry, (apply_func_t) 
_display_module_info_func TSRMLS_CC);
 
SECTION(Additional Modules);
php_info_print_table_start();
php_info_print_table_header(1, Module Name);
-   show_info_func = 0;
-   zend_hash_apply_with_argument(sorted_registry, 
(apply_func_arg_t) _display_module_info, show_info_func TSRMLS_CC);
+   zend_hash_apply(sorted_registry, (apply_func_t) 
_display_module_info_def TSRMLS_CC);
php_info_print_table_end();
 
zend_hash_destroy(sorted_registry);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.h?r1=1.38.2.1.2.3r2=1.38.2.1.2.4diff_format=u
Index: php-src/ext/standard/info.h
diff -u php-src/ext/standard/info.h:1.38.2.1.2.3 
php-src/ext/standard/info.h:1.38.2.1.2.4
--- php-src/ext/standard/info.h:1.38.2.1.2.3Mon Jan  1 09:36:08 2007
+++ php-src/ext/standard/info.h Thu Feb  8 16:55:34 2007
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: info.h,v 1.38.2.1.2.3 2007/01/01 09:36:08 sebastian Exp $ */
+/* $Id: info.h,v 1.38.2.1.2.4 2007/02/08

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/standard info.c

2006-11-26 Thread Ilia Alshanetsky

iliaa   Sun Nov 26 16:26:19 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard   info.c 
/php-srcNEWS 
  Log:
  Added a meta tag to phpinfo() output to prevent search engines from 
  indexing the page.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.c?r1=1.249.2.10.2.6r2=1.249.2.10.2.7diff_format=u
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.249.2.10.2.6 
php-src/ext/standard/info.c:1.249.2.10.2.7
--- php-src/ext/standard/info.c:1.249.2.10.2.6  Thu Sep 14 08:01:48 2006
+++ php-src/ext/standard/info.c Sun Nov 26 16:26:18 2006
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: info.c,v 1.249.2.10.2.6 2006/09/14 08:01:48 dmitry Exp $ */
+/* $Id: info.c,v 1.249.2.10.2.7 2006/11/26 16:26:18 iliaa Exp $ */
 
 #include php.h
 #include php_ini.h
@@ -380,6 +380,7 @@
PUTS(head\n);
php_info_print_style(TSRMLS_C);
PUTS(titlephpinfo()/title);
+   PUTS(meta name=\ROBOTS\ content=\NOINDEX,NOFOLLOW,NOARCHIVE\ /);
 /*
php_printf(meta http-equiv=\Content-Type\ content=\text/html; 
charset=%s\ /\n, charset);
 */
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.376r2=1.2027.2.547.2.377diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.376 php-src/NEWS:1.2027.2.547.2.377
--- php-src/NEWS:1.2027.2.547.2.376 Fri Nov 24 21:59:09 2006
+++ php-src/NEWSSun Nov 26 16:26:18 2006
@@ -1,6 +1,8 @@
 PHPNEWS
 |||
 ?? ??? 2007, PHP 5.2.1
+- Added a meta tag to phpinfo() output to prevent search engines from indexing 
+  the page. (Ilia)
 - Added missing object support to file_put_contents(). (Ilia)
 - Updated bundled libcURL to version 7.16.0 in the Windows distro. (Edin)
 - cgi.* and fastcgi.* directives are moved to INI subsystem.

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/standard info.c info.h

2006-07-28 Thread Ilia Alshanetsky

iliaa   Fri Jul 28 14:23:35 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
/php-src/ext/standard   info.c info.h 
  Log:
  ext/standard/info.c ext/standard/info.h
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.160r2=1.2027.2.547.2.161diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.160 php-src/NEWS:1.2027.2.547.2.161
--- php-src/NEWS:1.2027.2.547.2.160 Fri Jul 28 12:23:18 2006
+++ php-src/NEWSFri Jul 28 14:23:35 2006
@@ -15,6 +15,7 @@
   . Fixed bug #37564 (AES privacy encryption not possible due to net-snmp 5.2
 compatibility issue). (Patch: scott dot moynes+php at gmail dot com)
 
+- Fixed phpinfo() cutoff of variables at \0. (Ilia)
 - Fixed a bug in the filter extension that prevented magic_quotes_gpc from
   being applied when RAW filter is used. (Ilia)
 - Fixed bug #38236 (Binary data gets corrupted on multipart/formdata POST).
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.c?r1=1.249.2.10.2.2r2=1.249.2.10.2.3diff_format=u
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.249.2.10.2.2 
php-src/ext/standard/info.c:1.249.2.10.2.3
--- php-src/ext/standard/info.c:1.249.2.10.2.2  Sun Jun 11 20:47:34 2006
+++ php-src/ext/standard/info.c Fri Jul 28 14:23:35 2006
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: info.c,v 1.249.2.10.2.2 2006/06/11 20:47:34 iliaa Exp $ */
+/* $Id: info.c,v 1.249.2.10.2.3 2006/07/28 14:23:35 iliaa Exp $ */
 
 #include php.h
 #include php_ini.h
@@ -114,7 +114,6 @@
char *string_key;
uint string_len;
ulong num_key;
-   char *elem_esc = NULL;
 
zend_is_auto_global(name, name_length TSRMLS_CC);
 
@@ -134,11 +133,9 @@
switch (zend_hash_get_current_key_ex(Z_ARRVAL_PP(data), 
string_key, string_len, num_key, 0, NULL)) {
case HASH_KEY_IS_STRING:
if (!sapi_module.phpinfo_as_text) {
-   elem_esc = 
php_info_html_esc(string_key TSRMLS_CC);
-   PUTS(elem_esc);
-   efree(elem_esc);
+   
php_info_html_esc_write(string_key, string_len TSRMLS_CC);
} else {
-   PUTS(string_key);
+   PHPWRITE(string_key, 
string_len);
}   
break;
case HASH_KEY_IS_LONG:
@@ -167,12 +164,10 @@
if (Z_STRLEN(tmp2) == 0) {
PUTS(ino value/i);
} else {
-   elem_esc = 
php_info_html_esc(Z_STRVAL(tmp2) TSRMLS_CC);
-   PUTS(elem_esc);
-   efree(elem_esc);
+   
php_info_html_esc_write(Z_STRVAL(tmp2), Z_STRLEN(tmp2) TSRMLS_CC);
} 
} else {
-   PUTS(Z_STRVAL(tmp2));
+   PHPWRITE(Z_STRVAL(tmp2), 
Z_STRLEN(tmp2));
}   
zval_dtor(tmp2);
} else {
@@ -180,12 +175,10 @@
if (Z_STRLEN_PP(tmp) == 0) {
PUTS(ino value/i);
} else {
-   elem_esc = 
php_info_html_esc(Z_STRVAL_PP(tmp) TSRMLS_CC);
-   PUTS(elem_esc);
-   efree(elem_esc);
+   
php_info_html_esc_write(Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp) TSRMLS_CC);
}
} else {
-   PUTS(Z_STRVAL_PP(tmp));
+   PHPWRITE(Z_STRVAL_PP(tmp), 
Z_STRLEN_PP(tmp));
}   
}
if (!sapi_module.phpinfo_as_text) {
@@ -209,6 +202,17 @@
 }
 /* }}} */
 
+/* {{{ php_info_html_esc_write
+ */
+PHPAPI void php_info_html_esc_write(char *string, int str_len TSRMLS_DC)
+{
+   int new_len;
+   char *ret = php_escape_html_entities(string, str_len, new_len, 0, 
ENT_QUOTES, NULL TSRMLS_CC);
+
+   PHPWRITE(ret, new_len);
+   efree(ret);
+}
+/* }}} */
 
 /* {{{ php_info_html_esc
  */

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/standard info.c

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/standard info.c

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/standard info.c info.h /sapi/cli php.1.in php_cli.c

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/standard info.c

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/standard info.c info.h

5 matches

Site Navigation

Mail list logo

Footer information