cvs: php-src(PHP_5_0) /ext/com_dotnet com_extension.c /sapi/apache_hooks mod_php5.c /sapi/caudium caudium.c

tony2001 Fri Apr 22 05:14:34 2005 EDT Modified files: (Branch: PHP_5_0) /php-src/sapi/apache_hooks mod_php5.c /php-src/sapi/caudium caudium.c /php-src/ext/com_dotnet com_extension.c Log: fix C++ comments http://cvs.php.net/diff.php/php-src/sapi/apache_hooks/mod_php5.c?r1=1.4&r2=1.4.2.1&ty=u Index: php-src/sapi/apache_hooks/mod_php5.c diff -u php-src/sapi/apache_hooks/mod_php5.c:1.4 php-src/sapi/apache_hooks/mod_php5.c:1.4.2.1 --- php-src/sapi/apache_hooks/mod_php5.c:1.4 Wed Jul 14 05:55:24 2004 +++ php-src/sapi/apache_hooks/mod_php5.c Fri Apr 22 05:14:29 2005 @@ -17,7 +17,7 @@ | PHP 4.0 patches by Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: mod_php5.c,v 1.4 2004/07/14 09:55:24 sesser Exp $ */ +/* $Id: mod_php5.c,v 1.4.2.1 2005/04/22 09:14:29 tony2001 Exp $ */ #include "php_apache_http.h" @@ -95,7 +95,7 @@ module MODULE_VAR_EXPORT php5_module; int saved_umask; -//static int setup_env = 0; +/* static int setup_env = 0; */ static unsigned char apache_php_initialized; typedef struct _php_per_dir_entry { http://cvs.php.net/diff.php/php-src/sapi/caudium/caudium.c?r1=1.33&r2=1.33.2.1&ty=u Index: php-src/sapi/caudium/caudium.c diff -u php-src/sapi/caudium/caudium.c:1.33 php-src/sapi/caudium/caudium.c:1.33.2.1 --- php-src/sapi/caudium/caudium.c:1.33 Sat Jan 17 08:00:10 2004 +++ php-src/sapi/caudium/caudium.c Fri Apr 22 05:14:34 2005 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: caudium.c,v 1.33 2004/01/17 13:00:10 sniper Exp $ */ +/* $Id: caudium.c,v 1.33.2.1 2005/04/22 09:14:34 tony2001 Exp $ */ #include "php.h" #ifdef HAVE_CAUDIUM @@ -287,7 +287,7 @@ struct svalue *s_headermap, *soldval; int vallen; GET_THIS(); - // hval = make_shared_string(value); + /* hval = make_shared_string(value); */ ind = make_shared_string(" _headers"); hind = make_shared_binary_string(header_name, (int)(p - header_name)); @@ -444,7 +444,7 @@ { /* char buf[512]; */ php_info_print_table_start(); - php_info_print_table_row(2, "SAPI module version", "$Id: caudium.c,v 1.33 2004/01/17 13:00:10 sniper Exp $"); + php_info_print_table_row(2, "SAPI module version", "$Id: caudium.c,v 1.33.2.1 2005/04/22 09:14:34 tony2001 Exp $"); /* php_info_print_table_row(2, "Build date", Ns_InfoBuildDate()); php_info_print_table_row(2, "Config file path", Ns_InfoConfigFile()); php_info_print_table_row(2, "Error Log path", Ns_InfoErrorLog()); @@ -596,7 +596,7 @@ Pike_interpreter.recoveries = NULL; call_c_initializers(Pike_interpreter.thread_id); state->id=th_self(); - // SWAP_OUT_THREAD(OBJ2THREAD(Pike_interpreter.thread_id)); + /* SWAP_OUT_THREAD(OBJ2THREAD(Pike_interpreter.thread_id)); */ num_threads++; thread_table_insert(Pike_interpreter.thread_id); state->status=THREAD_RUNNING; http://cvs.php.net/diff.php/php-src/ext/com_dotnet/com_extension.c?r1=1.14.2.1&r2=1.14.2.2&ty=u Index: php-src/ext/com_dotnet/com_extension.c diff -u php-src/ext/com_dotnet/com_extension.c:1.14.2.1 php-src/ext/com_dotnet/com_extension.c:1.14.2.2 --- php-src/ext/com_dotnet/com_extension.c:1.14.2.1 Wed Jul 28 19:48:26 2004 +++ php-src/ext/com_dotnet/com_extension.c Fri Apr 22 05:14:34 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: com_extension.c,v 1.14.2.1 2004/07/28 23:48:26 wez Exp $ */ +/* $Id: com_extension.c,v 1.14.2.2 2005/04/22 09:14:34 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -194,12 +194,12 @@ INIT_CLASS_ENTRY(ce, "com_exception", NULL); php_com_exception_class_entry = zend_register_internal_class_ex(&ce, zend_exception_get_default(), NULL TSRMLS_CC); php_com_exception_class_entry->ce_flags |= ZEND_ACC_FINAL; -// php_com_exception_class_entry->constructor->common.fn_flags |= ZEND_ACC_PROTECTED; +/* php_com_exception_class_entry->constructor->common.fn_flags |= ZEND_ACC_PROTECTED; */ INIT_CLASS_ENTRY(ce, "com_safearray_proxy", NULL); php_com_saproxy_class_entry = zend_register_internal_class(&ce TSRMLS_CC); php_com_saproxy_class_entry->ce_flags |= ZEND_ACC_FINAL; -// php_com_saproxy_class_entry->constructor->common.fn_flags |= ZEND_ACC_PROTECTED; +/* php_com_saproxy_class_entry->constructor->common.fn_flags |= ZEND_ACC_PROTECTED; */ php_com_saproxy_class_entry->get_iterator = php_com_saproxy_iter_get; INIT_CLASS_ENTRY(ce, "variant", NULL);