CVS update: php31/ext/standard
| From: | shane | Date: | Thu, 03 Sep 1998 07:11:17 +0000 |
| Subject: | CVS update: php31/ext/standard | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-768@lists.php.net to get a copy of this message | ||
Date: Thursday September 3, 1998 @ 3:11
Author: shane
Update of /repository/php31/ext/standard
In directory asf:/u2/tmp/cvs-serv19580/ext/standard
Modified Files:
info.c info.h
Log Message:
Now here's a ton of work!
per server directives working via registry
per directory directives writen, untested
registry functions using automated config
main.c now uses automated config
added some stuff to automated config
info uses automated config
dl fix
Index: php31/ext/standard/info.c
diff -c php31/ext/standard/info.c:2.4 php31/ext/standard/info.c:2.5
*** php31/ext/standard/info.c:2.4 Fri Aug 21 13:37:04 1998
--- php31/ext/standard/info.c Thu Sep 3 03:11:17 1998
***************
*** 129,171 ****
SECTION("Configuration");
PUTS("<table border=5 width=\"600\">\n");
PUTS("<tr><th bgcolor=\"" HEADER_COLOR
"\">Directive</th><th bgcolor=\"" HEADER_COLOR
"\">Master Value</th><th bgcolor=\"" HEADER_COLOR
"\">Local Value</th></tr>\n");
- PHP3_CONF_LONG("error_reporting", php3_ini_master.error_reporting,
GLOBAL(php3_ini)->error_reporting);
- PHP3_CONF_LONG("max execution time", php3_ini_master.max_execution_time,
GLOBAL(php3_ini)->max_execution_time);
- PHP3_CONF_LONG("memory limit", php3_ini_master.memory_limit,
GLOBAL(php3_ini)->memory_limit);
- PHP3_CONF_STR("error_log", php3_ini_master.error_log, GLOBAL(php3_ini)->error_log);
- PHP3_CONF_LONG("magic_quotes_gpc", php3_ini_master.magic_quotes_gpc,
GLOBAL(php3_ini)->magic_quotes_gpc);
- PHP3_CONF_LONG("magic_quotes_runtime", php3_ini_master.magic_quotes_runtime,
GLOBAL(php3_ini)->magic_quotes_runtime);
- PHP3_CONF_LONG("track_errors", php3_ini_master.track_errors,
GLOBAL(php3_ini)->track_errors);
- 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("open_basedir", php3_ini_master.open_basedir,
GLOBAL(php3_ini)->open_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("include_path", php3_ini_master.include_path,
GLOBAL(php3_ini)->include_path);
- 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);
- /*
- PHP3_CONF_STR("debugger.host", php3_ini_master.debugger_host,
GLOBAL(php3_ini)->debugger_host);
- PHP3_CONF_LONG("debugger.port", php3_ini_master.debugger_port,
GLOBAL(php3_ini)->debugger_port);
- */
- PHP3_CONF_LONG("sql_safe_mode", php3_ini_master.sql_safe_mode,
GLOBAL(php3_ini)->sql_safe_mode);
- PHP3_CONF_LONG("xbithack", php3_ini_master.xbithack, GLOBAL(php3_ini)->xbithack);
- PHP3_CONF_LONG("engine", php3_ini_master.engine, GLOBAL(php3_ini)->engine);
- PHP3_CONF_LONG("last_modified", php3_ini_master.last_modified,
GLOBAL(php3_ini)->last_modified);
! /* And now for the highlight colours */
! php3_printf("<tr><td bgcolor=\"" ENTRY_NAME_COLOR
"\">highlight_comment</td><td bgcolor=\"" CONTENTS_COLOR
"\"><font color=%s> %s</font></td><td
bgcolor=\"" CONTENTS_COLOR "\"><font
color=%s> %s</font></td></tr>\n",php3_ini_master.highlight_comment,php3_ini_master.highlight_comment,GLOBAL(php3_ini)->highlight_comment,GLOBAL(php3_ini)->highlight_comment);
! php3_printf("<tr><td bgcolor=\"" ENTRY_NAME_COLOR
"\">highlight_default</td><td bgcolor=\"" CONTENTS_COLOR
"\"><font color=%s> %s</font></td><td
bgcolor=\"" CONTENTS_COLOR "\"><font
color=%s> %s</font></td></tr>\n",php3_ini_master.highlight_default,php3_ini_master.highlight_default,GLOBAL(php3_ini)->highlight_default,GLOBAL(php3_ini)->highlight_default);
! php3_printf("<tr><td bgcolor=\"" ENTRY_NAME_COLOR
"\">highlight_html</td><td bgcolor=\"" CONTENTS_COLOR
"\"><font color=%s> %s</font></td><td
bgcolor=\"" CONTENTS_COLOR "\"><font
color=%s> %s</font></td></tr>\n",php3_ini_master.highlight_html,php3_ini_master.highlight_html,GLOBAL(php3_ini)->highlight_html,GLOBAL(php3_ini)->highlight_html);
! php3_printf("<tr><td bgcolor=\"" ENTRY_NAME_COLOR
"\">highlight_string</td><td bgcolor=\"" CONTENTS_COLOR
"\"><font color=%s> %s</font></td><td
bgcolor=\"" CONTENTS_COLOR "\"><font
color=%s> %s</font></td></tr>\n",php3_ini_master.highlight_string,php3_ini_master.highlight_string,GLOBAL(php3_ini)->highlight_string,GLOBAL(php3_ini)->highlight_string);
! php3_printf("<tr><td bgcolor=\"" ENTRY_NAME_COLOR
"\">highlight_bg</td><td bgcolor=\"" CONTENTS_COLOR
"\"><font color=%s> %s</font></td><td
bgcolor=\"" CONTENTS_COLOR "\"><font
color=%s> %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> %s</font></td><td
bgcolor=\"" CONTENTS_COLOR "\"><font
color=%s> %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>");
{
--- 129,142 ----
SECTION("Configuration");
PUTS("<table border=5 width=\"600\">\n");
PUTS("<tr><th bgcolor=\"" HEADER_COLOR
"\">Directive</th><th bgcolor=\"" HEADER_COLOR
"\">Master Value</th><th bgcolor=\"" HEADER_COLOR
"\">Local Value</th></tr>\n");
! /* this outputs all the configuration information */
! #define AC_INFO_TABLE
! #include "automated_configuration_definitions.h"
! #include "automated_configuration.h"
! #undef AC_INFO_TABLE
!
!
PUTS("</table>");
{
Index: php31/ext/standard/info.h
diff -c php31/ext/standard/info.h:2.1 php31/ext/standard/info.h:2.2
*** php31/ext/standard/info.h:2.1 Fri Aug 21 09:48:41 1998
--- php31/ext/standard/info.h Thu Sep 3 03:11:17 1998
***************
*** 27,33 ****
| Zeev Suraski <bourbon@netvision.net.il> |
+----------------------------------------------------------------------+
*/
! /* $Id: info.h,v 2.1 1998/08/21 13:48:41 zeev Exp $ */
#ifndef _INFO_H
#define _INFO_H
--- 27,33 ----
| Zeev Suraski <bourbon@netvision.net.il> |
+----------------------------------------------------------------------+
*/
! /* $Id: info.h,v 2.2 1998/09/03 07:11:17 shane Exp $ */
#ifndef _INFO_H
#define _INFO_H
***************
*** 38,44 ****
#define CONTENTS_COLOR "#DDDDDD"
#define HEADER_COLOR "#00DDDD"
! #define PHP3_CONF_STR(directive,value1,value2) \
PUTS("<tr><td bgcolor=\"" ENTRY_NAME_COLOR "\">"); \
PUTS(directive); \
PUTS("</td><td bgcolor=\"" CONTENTS_COLOR
"\"> "); \
--- 38,44 ----
#define CONTENTS_COLOR "#DDDDDD"
#define HEADER_COLOR "#00DDDD"
! #define PHP3_CONF_STR(directive,value1,value2) { \
PUTS("<tr><td bgcolor=\"" ENTRY_NAME_COLOR "\">"); \
PUTS(directive); \
PUTS("</td><td bgcolor=\"" CONTENTS_COLOR
"\"> "); \
***************
*** 53,62 ****
} else { \
PUTS("<i>none</i>"); \
} \
! PUTS("</td></tr>\n");
#define PHP3_CONF_LONG(directive,value1,value2) \
! php3_printf("<tr><td bgcolor=\"" ENTRY_NAME_COLOR
"\">%s</td><td bgcolor=\"" CONTENTS_COLOR
"\">%ld</td><td bgcolor=\"" CONTENTS_COLOR
"\">%ld</td></tr>\n",directive,value1,value2);
extern void php3_version(INTERNAL_FUNCTION_PARAMETERS);
extern void php3_info(INTERNAL_FUNCTION_PARAMETERS);
--- 53,69 ----
} else { \
PUTS("<i>none</i>"); \
} \
! PUTS("</td></tr>\n"); }
#define PHP3_CONF_LONG(directive,value1,value2) \
! php3_printf("<tr><td bgcolor=\"" ENTRY_NAME_COLOR
"\">%s</td><td bgcolor=\"" CONTENTS_COLOR
"\">%ld</td><td bgcolor=\"" CONTENTS_COLOR
"\">%ld</td></tr>\n",directive,value1,value2)
!
! #define PHP3_CONF_OUT(directive,type,value1,value2) \
! if(type == AC_LONG) { \
! PHP3_CONF_LONG(directive,(long)value1,(long)value2); \
! } else if(type == AC_STRING) { \
! PHP3_CONF_STR(directive,(char *)value1,(char *)value2); \
! }
extern void php3_version(INTERNAL_FUNCTION_PARAMETERS);
extern void php3_info(INTERNAL_FUNCTION_PARAMETERS);
--
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