CVS update: php31/ext/standard

Date: Friday August 14, 1998 @ 13:08 Author: shane Update of /repository/php31/ext/standard In directory asf:/tmp/cvs-serv1085/ext/standard Modified Files: info.c pack.c Log Message: more 3.0->3.1 patches. Fix defines in sapi.h, now why didnt msvc catch those? Index: php31/ext/standard/info.c diff -c php31/ext/standard/info.c:2.0 php31/ext/standard/info.c:2.1 *** php31/ext/standard/info.c:2.0 Fri Jul 3 09:14:27 1998 --- php31/ext/standard/info.c Fri Aug 14 13:08:22 1998 *************** *** 140,145 **** --- 140,146 ---- PHP3_CONF_STR("doc_root", php3_ini_master.doc_root, GLOBAL(php3_ini)->doc_root); PHP3_CONF_STR("user_dir", php3_ini_master.user_dir, GLOBAL(php3_ini)->user_dir); PHP3_CONF_LONG("safe_mode", php3_ini_master.safe_mode, GLOBAL(php3_ini)->safe_mode); + PHP3_CONF_STR("fopen_basedir", php3_ini_master.fopen_basedir, GLOBAL(php3_ini)->fopen_basedir); PHP3_CONF_LONG("track_vars", php3_ini_master.track_vars, GLOBAL(php3_ini)->track_vars); PHP3_CONF_STR("safe_mode_exec_dir", php3_ini_master.safe_mode_exec_dir, GLOBAL(php3_ini)->safe_mode_exec_dir); PHP3_CONF_STR("cgi_ext", php3_ini_master.cgi_ext, GLOBAL(php3_ini)->cgi_ext); *************** *** 149,154 **** --- 150,156 ---- PHP3_CONF_STR("auto_prepend_file", php3_ini_master.auto_prepend_file, GLOBAL(php3_ini)->auto_prepend_file); PHP3_CONF_STR("auto_append_file", php3_ini_master.auto_append_file, GLOBAL(php3_ini)->auto_append_file); PHP3_CONF_STR("upload_tmp_dir", php3_ini_master.upload_tmp_dir, GLOBAL(php3_ini)->upload_tmp_dir); + PHP3_CONF_LONG("enable_dl", php3_ini_master.enable_dl, GLOBAL(php3_ini)->enable_dl); PHP3_CONF_STR("extension_dir", php3_ini_master.extension_dir, GLOBAL(php3_ini)->extension_dir); PHP3_CONF_STR("arg_separator", php3_ini_master.arg_separator, GLOBAL(php3_ini)->arg_separator); PHP3_CONF_LONG("short_open_tag", php3_ini_master.short_open_tag, GLOBAL(php3_ini)->short_open_tag); *************** *** 167,172 **** --- 169,272 ---- php3_printf("<tr><td bgcolor=\"" ENTRY_NAME_COLOR "\">highlight_bg</td><td bgcolor=\"" CONTENTS_COLOR "\"><font color=%s>&nbsp;%s</font></td><td bgcolor=\"" CONTENTS_COLOR "\"><font color=%s>&nbsp;%s</font></td></tr>\n",php3_ini_master.highlight_bg,php3_ini_master.highlight_bg,GLOBAL(php3_ini)->highlight_bg,GLOBAL(php3_ini)->highlight_bg); php3_printf("<tr><td bgcolor=\"" ENTRY_NAME_COLOR "\">highlight_keyword</td><td bgcolor=\"" CONTENTS_COLOR "\"><font color=%s>&nbsp;%s</font></td><td bgcolor=\"" CONTENTS_COLOR "\"><font color=%s>&nbsp;%s</font></td></tr>\n",php3_ini_master.highlight_keyword,php3_ini_master.highlight_keyword,GLOBAL(php3_ini)->highlight_keyword,GLOBAL(php3_ini)->highlight_keyword); PUTS("</table>"); + + { + pval *data, *tmp; + char *string_key; + int int_key; + + SECTION("PHP Variables"); + + PUTS("<table border=5 width=\"600\">\n"); + PUTS("<tr><th bgcolor=\"" HEADER_COLOR "\">Variable</th><th bgcolor=\"" HEADER_COLOR "\">Value</th></tr>\n"); + if (_php3_hash_find(GLOBAL(active_symbol_table), "PHP_SELF", sizeof("PHP_SELF"), (void **) &data) != FAILURE) { + PUTS("<tr><td bgcolor=\"" ENTRY_NAME_COLOR "\">"); + PUTS("PHP_SELF"); + PUTS("</td><td bgcolor=\"" CONTENTS_COLOR "\">"); + PUTS(data->value.str.val); + PUTS("</td></tr>\n"); + } + if (_php3_hash_find(GLOBAL(active_symbol_table), "PHP_AUTH_TYPE", sizeof("PHP_AUTH_TYPE"), (void **) &data) != FAILURE) { + PUTS("<tr><td bgcolor=\"" ENTRY_NAME_COLOR "\">"); + PUTS("PHP_AUTH_TYPE"); + PUTS("</td><td bgcolor=\"" CONTENTS_COLOR "\">"); + PUTS(data->value.str.val); + PUTS("</td></tr>\n"); + } + if (_php3_hash_find(GLOBAL(active_symbol_table), "PHP_AUTH_USER", sizeof("PHP_AUTH_USER"), (void **) &data) != FAILURE) { + PUTS("<tr><td bgcolor=\"" ENTRY_NAME_COLOR "\">"); + PUTS("PHP_AUTH_USER"); + PUTS("</td><td bgcolor=\"" CONTENTS_COLOR "\">"); + PUTS(data->value.str.val); + PUTS("</td></tr>\n"); + } + if (_php3_hash_find(GLOBAL(active_symbol_table), "PHP_AUTH_PW", sizeof("PHP_AUTH_PW"), (void **) &data) != FAILURE) { + PUTS("<tr><td bgcolor=\"" ENTRY_NAME_COLOR "\">"); + PUTS("PHP_AUTH_PW"); + PUTS("</td><td bgcolor=\"" CONTENTS_COLOR "\">"); + PUTS(data->value.str.val); + PUTS("</td></tr>\n"); + } + if (_php3_hash_find(GLOBAL(active_symbol_table), "HTTP_GET_VARS", sizeof("HTTP_GET_VARS"), (void **) &data) != FAILURE) { + _php3_hash_internal_pointer_reset(data->value.ht); + while (_php3_hash_get_current_data(data->value.ht, (void **) &tmp) == SUCCESS) { + convert_to_string(tmp); + PUTS("<tr><td bgcolor=\"" ENTRY_NAME_COLOR "\">HTTP_GET_VARS[\""); + switch (_php3_hash_get_current_key(data->value.ht, &string_key, &int_key)) { + case HASH_KEY_IS_STRING: + PUTS(string_key); + break; + case HASH_KEY_IS_INT: + php3_printf("%d",int_key); + break; + } + PUTS("\"]</td><td bgcolor=\"" CONTENTS_COLOR "\">"); + PUTS(tmp->value.str.val); /* This could be "Array" - too ugly to expand that for now */ + PUTS("</td></tr>\n"); + _php3_hash_move_forward(data->value.ht); + } + } + if (_php3_hash_find(GLOBAL(active_symbol_table), "HTTP_POST_VARS", sizeof("HTTP_POST_VARS"), (void **) &data) != FAILURE) { + _php3_hash_internal_pointer_reset(data->value.ht); + while (_php3_hash_get_current_data(data->value.ht, (void **) &tmp) == SUCCESS) { + convert_to_string(tmp); + PUTS("<tr><td bgcolor=\"" ENTRY_NAME_COLOR "\">HTTP_POST_VARS[\""); + switch (_php3_hash_get_current_key(data->value.ht, &string_key, &int_key)) { + case HASH_KEY_IS_STRING: + PUTS(string_key); + break; + case HASH_KEY_IS_INT: + php3_printf("%d",int_key); + break; + } + PUTS("\"]</td><td bgcolor=\"" CONTENTS_COLOR "\">"); + PUTS(tmp->value.str.val); + PUTS("</td></tr>\n"); + _php3_hash_move_forward(data->value.ht); + } + } + if (_php3_hash_find(GLOBAL(active_symbol_table), "HTTP_COOKIE_VARS", sizeof("HTTP_COOKIE_VARS"), (void **) &data) != FAILURE) { + _php3_hash_internal_pointer_reset(data->value.ht); + while (_php3_hash_get_current_data(data->value.ht, (void **) &tmp) == SUCCESS) { + convert_to_string(tmp); + PUTS("<tr><td bgcolor=\"" ENTRY_NAME_COLOR "\">HTTP_COOKIE_VARS[\""); + switch (_php3_hash_get_current_key(data->value.ht, &string_key, &int_key)) { + case HASH_KEY_IS_STRING: + PUTS(string_key); + break; + case HASH_KEY_IS_INT: + php3_printf("%d",int_key); + break; + } + PUTS("\"]</td><td bgcolor=\"" CONTENTS_COLOR "\">"); + PUTS(tmp->value.str.val); + PUTS("</td></tr>\n"); + _php3_hash_move_forward(data->value.ht); + } + } + PUTS("</table>\n"); + } + GLOBAL(sapi_rqst)->info(SAPI_GLOBAL_PASS_V); Index: php31/ext/standard/pack.c diff -c php31/ext/standard/pack.c:2.0 php31/ext/standard/pack.c:2.1 *** php31/ext/standard/pack.c:2.0 Fri Jul 3 09:14:31 1998 --- php31/ext/standard/pack.c Fri Aug 14 13:08:22 1998 *************** *** 62,68 **** #include "snprintf.h" #include "fsock.h" #if HAVE_NETINET_IN_H ! #include "netinet/in.h" #endif function_entry pack_functions[] = { --- 62,68 ---- #include "snprintf.h" #include "fsock.h" #if HAVE_NETINET_IN_H ! #include <netinet/in.h> #endif function_entry pack_functions[] = { -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net