httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Brian Behlendorf <br...@hyperreal.com>
Subject cvs commit: apache/src http_core.c
Date Sun, 17 Nov 1996 20:31:54 GMT
brian       96/11/17 12:31:53

  Modified:    src       http_core.c
  Log:
  Added explanatory text for a majority of http_core.c directives, for mod_info
  and httpd -h output.
  
  Revision  Changes    Path
  1.46      +36 -37    apache/src/http_core.c
  
  Index: http_core.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/http_core.c,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -C3 -r1.45 -r1.46
  *** http_core.c	1996/11/12 05:22:04	1.45
  --- http_core.c	1996/11/17 20:31:52	1.46
  ***************
  *** 1071,1097 ****
    
    /* Old access config file commands */
    
  ! { "<Directory", dirsection, NULL, RSRC_CONF, RAW_ARGS, NULL },
    { "</Directory>", end_dirsection, NULL, ACCESS_CONF, NO_ARGS, NULL },
  ! { "<Location", urlsection, NULL, RSRC_CONF, RAW_ARGS, NULL },
    { "</Location>", end_urlsection, NULL, ACCESS_CONF, NO_ARGS, NULL },
  ! { "<Files", filesection, NULL, OR_ALL, RAW_ARGS, NULL },
    { "</Files>", end_filesection, NULL, OR_ALL, NO_ARGS, NULL },
  ! { "<Limit", limit, NULL, OR_ALL, RAW_ARGS, NULL },
    { "</Limit>", endlimit, NULL, OR_ALL, RAW_ARGS, NULL },
    { "AuthType", set_string_slot, (void*)XtOffsetOf(core_dir_config, auth_type),
  !     OR_AUTHCFG, TAKE1, "an HTTP authorization type (e.g., \"Basic\")" },
    { "AuthName", set_string_slot, (void*)XtOffsetOf(core_dir_config, auth_name),
  !     OR_AUTHCFG, RAW_ARGS, NULL },
  ! { "Require", require, NULL, OR_AUTHCFG, RAW_ARGS, NULL },
        
    /* Old resource config file commands */
      
  ! { "AccessFileName", set_access_name, NULL, RSRC_CONF, TAKE1, NULL },
  ! { "DocumentRoot", set_document_root, NULL, RSRC_CONF, TAKE1, NULL },
  ! { "ErrorDocument", set_error_document, NULL, OR_FILEINFO, RAW_ARGS, NULL },
  ! { "AllowOverride", set_override, NULL, ACCESS_CONF, RAW_ARGS, NULL },
  ! { "Options", set_options, NULL, OR_OPTIONS, RAW_ARGS, NULL },
    { "DefaultType", set_string_slot,
        (void*)XtOffsetOf (core_dir_config, default_type),
        OR_FILEINFO, TAKE1, "the default MIME type for untypable files" },
  --- 1071,1101 ----
    
    /* Old access config file commands */
    
  ! { "<Directory", dirsection, NULL, RSRC_CONF, RAW_ARGS, "Container for directives affecting
resources located in the specified directories" },
    { "</Directory>", end_dirsection, NULL, ACCESS_CONF, NO_ARGS, NULL },
  ! { "<Location", urlsection, NULL, RSRC_CONF, RAW_ARGS, "Container for directives affecting
resources accessed through the specified URL paths" },
    { "</Location>", end_urlsection, NULL, ACCESS_CONF, NO_ARGS, NULL },
  ! { "<VirtualHost", virtualhost_section, NULL, RSRC_CONF, RAW_ARGS, "Container to map
directives to a particular virtual host" },
  ! { "</VirtualHost>", end_virtualhost_section, NULL, RSRC_CONF, NO_ARGS, NULL },
  ! { "<Files", filesection, NULL, OR_ALL, RAW_ARGS, "Container for directives affecting
files matching specified patterns" },
    { "</Files>", end_filesection, NULL, OR_ALL, NO_ARGS, NULL },
  ! { "<Limit", limit, NULL, OR_ALL, RAW_ARGS, "Container for authentication directives
when accessed using specified HTTP methods" },
    { "</Limit>", endlimit, NULL, OR_ALL, RAW_ARGS, NULL },
  + { "<IfModule", start_ifmod, NULL, OR_ALL, RAW_ARGS, "Container for directives based
on existance of specified modules" },
  + { "</IfModule>", end_ifmod, NULL, OR_ALL, NO_ARGS, NULL },
    { "AuthType", set_string_slot, (void*)XtOffsetOf(core_dir_config, auth_type),
  !     OR_AUTHCFG, TAKE1, "An HTTP authorization type (e.g., \"Basic\")" },
    { "AuthName", set_string_slot, (void*)XtOffsetOf(core_dir_config, auth_name),
  !     OR_AUTHCFG, RAW_ARGS, "The authentication realm (e.g. \"Members Only\")" },
  ! { "Require", require, NULL, OR_AUTHCFG, RAW_ARGS, "Selects which authenticated users or
groups may access a protected space" },
        
    /* Old resource config file commands */
      
  ! { "AccessFileName", set_access_name, NULL, RSRC_CONF, TAKE1, "Name of per-directory config
files (default: .htaccess)" },
  ! { "DocumentRoot", set_document_root, NULL, RSRC_CONF, TAKE1, "Root directory of the document
tree"  },
  ! { "ErrorDocument", set_error_document, NULL, OR_FILEINFO, RAW_ARGS, "Change responses
for HTTP errors" },
  ! { "AllowOverride", set_override, NULL, ACCESS_CONF, RAW_ARGS, "Controls what groups of
directives can be configured by per-directory config files" },
  ! { "Options", set_options, NULL, OR_OPTIONS, RAW_ARGS, "Set a number of attributes for
a given directory" },
    { "DefaultType", set_string_slot,
        (void*)XtOffsetOf (core_dir_config, default_type),
        OR_FILEINFO, TAKE1, "the default MIME type for untypable files" },
  ***************
  *** 1099,1148 ****
    /* Old server config file commands */
    
    { "ServerType", server_type, NULL, RSRC_CONF, TAKE1,"'inetd' or 'standalone'"},
  ! { "Port", server_port, NULL, RSRC_CONF, TAKE1, "a TCP port number"},
  ! { "HostnameLookups", set_hostname_lookups, NULL, ACCESS_CONF|RSRC_CONF, FLAG, NULL },
  ! { "User", set_user, NULL, RSRC_CONF, TAKE1, "effective user id for this server"},
  ! { "Group", set_group, NULL, RSRC_CONF, TAKE1, "effective group id for this server"},
    { "ServerAdmin", set_server_string_slot,
      (void *)XtOffsetOf (server_rec, server_admin), RSRC_CONF, TAKE1,
      "The email address of the server administrator" },
    { "ServerName", set_server_string_slot,
      (void *)XtOffsetOf (server_rec, server_hostname), RSRC_CONF, TAKE1,
      "The hostname of the server" },
  ! { "ServerRoot", set_server_root, NULL, RSRC_CONF, TAKE1, "a directory"},
    { "ErrorLog", set_server_string_slot,
      (void *)XtOffsetOf (server_rec, error_fname), RSRC_CONF, TAKE1,
  !   "the filename of the error log" },
    { "PidFile", set_pidfile, NULL, RSRC_CONF, TAKE1,
  !     "a file for logging the server process ID"},
    { "ScoreBoardFile", set_scoreboard, NULL, RSRC_CONF, TAKE1,
  !     "a file for apache to maintain runtime process management information"},
    { "AccessConfig", set_server_string_slot,
      (void *)XtOffsetOf (server_rec, access_confname), RSRC_CONF, TAKE1,
  !   "the filename of the access config file" },
    { "ResourceConfig", set_server_string_slot,
      (void *)XtOffsetOf (server_rec, srm_confname), RSRC_CONF, TAKE1,
  !   "the filename of the resource config file" },
    { "ServerAlias", set_server_string_slot,
       (void *)XtOffsetOf (server_rec, names), RSRC_CONF, RAW_ARGS,
  !    "a name or names alternately used to access the server" },
    { "ServerPath", set_serverpath, NULL, RSRC_CONF, TAKE1,
      "The pathname the server can be reached at" },
  ! { "Timeout", set_timeout, NULL, RSRC_CONF, TAKE1, "timeout duration (sec)"},
    { "KeepAliveTimeout", set_keep_alive_timeout, NULL, RSRC_CONF, TAKE1, "Keep-Alive timeout
duration (sec)"},
    { "KeepAlive", set_keep_alive, NULL, RSRC_CONF, TAKE1, "Maximum Keep-Alive requests per
connection (0 to disable)" },
  ! { "IdentityCheck", set_idcheck, NULL, RSRC_CONF|ACCESS_CONF, FLAG, NULL },
  ! { "<IfModule", start_ifmod, NULL, OR_ALL, RAW_ARGS, NULL },
  ! { "</IfModule>", end_ifmod, NULL, OR_ALL, NO_ARGS, NULL },
    { "ContentDigest", set_content_md5, NULL, RSRC_CONF|ACCESS_CONF|OR_AUTHCFG, FLAG, "whether
or not to send a Content-MD5 header with each request" },
  ! { "CacheNegotiatedDocs", },
  ! { "StartServers", set_daemons_to_start, NULL, RSRC_CONF, TAKE1, NULL },
  ! { "MinSpareServers", set_min_free_servers, NULL, RSRC_CONF, TAKE1, NULL },
  ! { "MaxSpareServers", set_max_free_servers, NULL, RSRC_CONF, TAKE1, NULL },
  ! { "MaxServers", set_max_free_servers, NULL, RSRC_CONF, TAKE1, NULL },
  ! { "ServersSafetyLimit", set_server_limit, NULL, RSRC_CONF, TAKE1, NULL },
  ! { "MaxClients", set_server_limit, NULL, RSRC_CONF, TAKE1, NULL },
  ! { "MaxRequestsPerChild", set_max_requests, NULL, RSRC_CONF, TAKE1, NULL },
    { "RLimitCPU",
    #ifdef RLIMIT_CPU
     set_limit_cpu, (void*)XtOffsetOf(core_dir_config, limit_cpu),
  --- 1103,1149 ----
    /* Old server config file commands */
    
    { "ServerType", server_type, NULL, RSRC_CONF, TAKE1,"'inetd' or 'standalone'"},
  ! { "Port", server_port, NULL, RSRC_CONF, TAKE1, "A TCP port number"},
  ! { "HostnameLookups", set_hostname_lookups, NULL, ACCESS_CONF|RSRC_CONF, FLAG, "\"on\"
to enable or \"off\" to disable reverse DNS lookups" },
  ! { "User", set_user, NULL, RSRC_CONF, TAKE1, "Effective user id for this server"},
  ! { "Group", set_group, NULL, RSRC_CONF, TAKE1, "Effective group id for this server"},
    { "ServerAdmin", set_server_string_slot,
      (void *)XtOffsetOf (server_rec, server_admin), RSRC_CONF, TAKE1,
      "The email address of the server administrator" },
    { "ServerName", set_server_string_slot,
      (void *)XtOffsetOf (server_rec, server_hostname), RSRC_CONF, TAKE1,
      "The hostname of the server" },
  ! { "ServerRoot", set_server_root, NULL, RSRC_CONF, TAKE1, "Common directory of server-related
files (logs, confs, etc)" },
    { "ErrorLog", set_server_string_slot,
      (void *)XtOffsetOf (server_rec, error_fname), RSRC_CONF, TAKE1,
  !   "The filename of the error log" },
    { "PidFile", set_pidfile, NULL, RSRC_CONF, TAKE1,
  !     "A file for logging the server process ID"},
    { "ScoreBoardFile", set_scoreboard, NULL, RSRC_CONF, TAKE1,
  !     "A file for Apache to maintain runtime process management information"},
    { "AccessConfig", set_server_string_slot,
      (void *)XtOffsetOf (server_rec, access_confname), RSRC_CONF, TAKE1,
  !   "The filename of the access config file" },
    { "ResourceConfig", set_server_string_slot,
      (void *)XtOffsetOf (server_rec, srm_confname), RSRC_CONF, TAKE1,
  !   "The filename of the resource config file" },
    { "ServerAlias", set_server_string_slot,
       (void *)XtOffsetOf (server_rec, names), RSRC_CONF, RAW_ARGS,
  !    "A name or names alternately used to access the server" },
    { "ServerPath", set_serverpath, NULL, RSRC_CONF, TAKE1,
      "The pathname the server can be reached at" },
  ! { "Timeout", set_timeout, NULL, RSRC_CONF, TAKE1, "Timeout duration (sec)"},
    { "KeepAliveTimeout", set_keep_alive_timeout, NULL, RSRC_CONF, TAKE1, "Keep-Alive timeout
duration (sec)"},
    { "KeepAlive", set_keep_alive, NULL, RSRC_CONF, TAKE1, "Maximum Keep-Alive requests per
connection (0 to disable)" },
  ! { "IdentityCheck", set_idcheck, NULL, RSRC_CONF|ACCESS_CONF, FLAG, "Enable identd (RFC931)
user lookups - SLOW" },
    { "ContentDigest", set_content_md5, NULL, RSRC_CONF|ACCESS_CONF|OR_AUTHCFG, FLAG, "whether
or not to send a Content-MD5 header with each request" },
  ! { "StartServers", set_daemons_to_start, NULL, RSRC_CONF, TAKE1, "Number of child processes
launched at server startup" },
  ! { "MinSpareServers", set_min_free_servers, NULL, RSRC_CONF, TAKE1, "Minimum number of
idle children, to handle request spikes" },
  ! { "MaxSpareServers", set_max_free_servers, NULL, RSRC_CONF, TAKE1, "Maximum number of
idle children" },
  ! { "MaxServers", set_max_free_servers, NULL, RSRC_CONF, TAKE1, "Deprecated equivalent to
MaxSpareServers" },
  ! { "ServersSafetyLimit", set_server_limit, NULL, RSRC_CONF, TAKE1, "Deprecated equivalent
to MaxClients" },
  ! { "MaxClients", set_server_limit, NULL, RSRC_CONF, TAKE1, "Maximum number of children
alive at the same time" },
  ! { "MaxRequestsPerChild", set_max_requests, NULL, RSRC_CONF, TAKE1, "Maximum number of
requests a particular child serves before dying." },
    { "RLimitCPU",
    #ifdef RLIMIT_CPU
     set_limit_cpu, (void*)XtOffsetOf(core_dir_config, limit_cpu),
  ***************
  *** 1169,1176 ****
    { "Listen", set_listener, NULL, RSRC_CONF, TAKE1,
          "a port number or a numeric IP address and a port number"},
    { "SendBufferSize", set_send_buffer_size, NULL, RSRC_CONF, TAKE1, "send buffer size in
bytes"},
  - { "<VirtualHost", virtualhost_section, NULL, RSRC_CONF, RAW_ARGS, NULL },
  - { "</VirtualHost>", end_virtualhost_section, NULL, RSRC_CONF, NO_ARGS, NULL },
    { "AddModule", add_module_command, NULL, RSRC_CONF, ITERATE,
      "the name of a module" },
    { "ClearModuleList", clear_module_list_command, NULL, RSRC_CONF, NO_ARGS, NULL },
  --- 1170,1175 ----
  
  
  

Mime
View raw message