httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject cvs commit: httpd-2.0/server/mpm/prefork prefork.c
Date Sun, 19 Aug 2001 05:48:19 GMT
rbb         01/08/18 22:48:19

  Modified:    modules/aaa mod_auth.c mod_auth_db.c mod_auth_dbm.c
                        mod_auth_ldap.c
               modules/generators mod_autoindex.c
               modules/http mod_mime.c
               modules/mappers mod_imap.c
               modules/metadata mod_unique_id.c
               modules/test mod_autoindex.c
               server   core.c
               server/mpm/prefork prefork.c
  Log:
  Update the Apache code to account for the XtOffset change in APR.
  
  Revision  Changes    Path
  1.35      +3 -3      httpd-2.0/modules/aaa/mod_auth.c
  
  Index: mod_auth.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/aaa/mod_auth.c,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- mod_auth.c	2001/08/11 04:04:12	1.34
  +++ mod_auth.c	2001/08/19 05:48:18	1.35
  @@ -110,13 +110,13 @@
   static const command_rec auth_cmds[] =
   {
       AP_INIT_TAKE12("AuthUserFile", set_auth_slot,
  -                   (void *) XtOffsetOf(auth_config_rec, auth_pwfile), OR_AUTHCFG,
  +                   (void *) APR_XtOffsetOf(auth_config_rec, auth_pwfile), OR_AUTHCFG,
                      "text file containing user IDs and passwords"),
       AP_INIT_TAKE12("AuthGroupFile", set_auth_slot,
  -                   (void *) XtOffsetOf(auth_config_rec, auth_grpfile), OR_AUTHCFG,
  +                   (void *) APR_XtOffsetOf(auth_config_rec, auth_grpfile), OR_AUTHCFG,
                      "text file containing group names and member user IDs"),
       AP_INIT_FLAG("AuthAuthoritative", ap_set_flag_slot,
  -                 (void *) XtOffsetOf(auth_config_rec, auth_authoritative),
  +                 (void *) APR_XtOffsetOf(auth_config_rec, auth_authoritative),
                    OR_AUTHCFG,
                    "Set to 'no' to allow access control to be passed along to lower "
                    "modules if the UserID is not known to this module"),
  
  
  
  1.31      +5 -5      httpd-2.0/modules/aaa/mod_auth_db.c
  
  Index: mod_auth_db.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/aaa/mod_auth_db.c,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- mod_auth_db.c	2001/08/11 04:04:12	1.30
  +++ mod_auth_db.c	2001/08/19 05:48:18	1.31
  @@ -146,19 +146,19 @@
   static const command_rec db_auth_cmds[] =
   {
       AP_INIT_TAKE1("AuthDBUserFile", ap_set_file_slot,
  -     (void *) XtOffsetOf(db_auth_config_rec, auth_dbpwfile),
  +     (void *) APR_XtOffsetOf(db_auth_config_rec, auth_dbpwfile),
        OR_AUTHCFG, "db database file containing user IDs and passwords"),
       AP_INIT_TAKE1("AuthDBGroupFile", ap_set_file_slot,
  -     (void *) XtOffsetOf(db_auth_config_rec, auth_dbgrpfile),
  +     (void *) APR_XtOffsetOf(db_auth_config_rec, auth_dbgrpfile),
        OR_AUTHCFG, "db database file containing group names and member user IDs"),
       AP_INIT_TAKE12("AuthUserFile", set_db_slot,
  -     (void *) XtOffsetOf(db_auth_config_rec, auth_dbpwfile),
  +     (void *) APR_XtOffsetOf(db_auth_config_rec, auth_dbpwfile),
        OR_AUTHCFG, NULL),
       AP_INIT_TAKE12("AuthGroupFile", set_db_slot,
  -     (void *) XtOffsetOf(db_auth_config_rec, auth_dbgrpfile),
  +     (void *) APR_XtOffsetOf(db_auth_config_rec, auth_dbgrpfile),
        OR_AUTHCFG, NULL),
       AP_INIT_FLAG("AuthDBAuthoritative", ap_set_flag_slot,
  -     (void *) XtOffsetOf(db_auth_config_rec, auth_dbauthoritative),
  +     (void *) APR_XtOffsetOf(db_auth_config_rec, auth_dbauthoritative),
        OR_AUTHCFG,
        "Set to 'no' to allow access control to be passed along to lower modules if the userID
is not known to this module"),
       {NULL}
  
  
  
  1.36      +5 -5      httpd-2.0/modules/aaa/mod_auth_dbm.c
  
  Index: mod_auth_dbm.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/aaa/mod_auth_dbm.c,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- mod_auth_dbm.c	2001/08/11 04:04:12	1.35
  +++ mod_auth_dbm.c	2001/08/19 05:48:18	1.36
  @@ -142,19 +142,19 @@
   static const command_rec dbm_auth_cmds[] =
   {
       AP_INIT_TAKE1("AuthDBMUserFile", ap_set_file_slot,
  -     (void *) XtOffsetOf(dbm_auth_config_rec, auth_dbmpwfile),
  +     (void *) APR_XtOffsetOf(dbm_auth_config_rec, auth_dbmpwfile),
        OR_AUTHCFG, "dbm database file containing user IDs and passwords"),
       AP_INIT_TAKE1("AuthDBMGroupFile", ap_set_file_slot,
  -     (void *) XtOffsetOf(dbm_auth_config_rec, auth_dbmgrpfile),
  +     (void *) APR_XtOffsetOf(dbm_auth_config_rec, auth_dbmgrpfile),
        OR_AUTHCFG, "dbm database file containing group names and member user IDs"),
       AP_INIT_TAKE12("AuthUserFile", set_dbm_slot,
  -     (void *) XtOffsetOf(dbm_auth_config_rec, auth_dbmpwfile),
  +     (void *) APR_XtOffsetOf(dbm_auth_config_rec, auth_dbmpwfile),
        OR_AUTHCFG, NULL),
       AP_INIT_TAKE12("AuthGroupFile", set_dbm_slot,
  -     (void *) XtOffsetOf(dbm_auth_config_rec, auth_dbmgrpfile),
  +     (void *) APR_XtOffsetOf(dbm_auth_config_rec, auth_dbmgrpfile),
        OR_AUTHCFG, NULL),
       AP_INIT_FLAG("AuthDBMAuthoritative", ap_set_flag_slot,
  -     (void *) XtOffsetOf(dbm_auth_config_rec, auth_dbmauthoritative),
  +     (void *) APR_XtOffsetOf(dbm_auth_config_rec, auth_dbmauthoritative),
        OR_AUTHCFG, "Set to 'no' to allow access control to be passed along to lower modules,
if the UserID is not known in this module"),
       {NULL}
   };
  
  
  
  1.4       +9 -9      httpd-2.0/modules/aaa/mod_auth_ldap.c
  
  Index: mod_auth_ldap.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/aaa/mod_auth_ldap.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- mod_auth_ldap.c	2001/08/19 01:03:26	1.3
  +++ mod_auth_ldap.c	2001/08/19 05:48:18	1.4
  @@ -754,26 +754,26 @@
                     "search on the branch <b>ou=People, o=Airius</b>."),
   
       AP_INIT_TAKE1("AuthLDAPBindDN", ap_set_string_slot,
  -                  (void *)XtOffsetOf(mod_auth_ldap_config_t, binddn), OR_AUTHCFG,
  +                  (void *)APR_XtOffsetOf(mod_auth_ldap_config_t, binddn), OR_AUTHCFG,
                     "DN to use to bind to LDAP server. If not provided, will do an anonymous
bind."),
   
       AP_INIT_TAKE1("AuthLDAPBindPassword", ap_set_string_slot,
  -                  (void *)XtOffsetOf(mod_auth_ldap_config_t, bindpw), OR_AUTHCFG,
  +                  (void *)APR_XtOffsetOf(mod_auth_ldap_config_t, bindpw), OR_AUTHCFG,
                     "Password to use to bind to LDAP server. If not provided, will do an
anonymous bind."),
   
       AP_INIT_FLAG("AuthLDAPRemoteUserIsDN", ap_set_flag_slot,
  -                 (void *)XtOffsetOf(mod_auth_ldap_config_t, user_is_dn), OR_AUTHCFG,
  +                 (void *)APR_XtOffsetOf(mod_auth_ldap_config_t, user_is_dn), OR_AUTHCFG,
                    "Set to 'on' to set the REMOTE_USER environment variable to be the full
"
                    "DN of the remote user. By default, this is set to off, meaning that "
                    "the REMOTE_USER variable will contain whatever value the remote user
sent."),
   
       AP_INIT_FLAG("AuthLDAPAuthoritative", ap_set_flag_slot,
  -                 (void *)XtOffsetOf(mod_auth_ldap_config_t, auth_authoritative), OR_AUTHCFG,
  +                 (void *)APR_XtOffsetOf(mod_auth_ldap_config_t, auth_authoritative), OR_AUTHCFG,
                    "Set to 'off' to allow access control to be passed along to lower modules
if "
                    "the UserID and/or group is not known to this module"),
   
       AP_INIT_FLAG("AuthLDAPCompareDNOnServer", ap_set_flag_slot,
  -                 (void *)XtOffsetOf(mod_auth_ldap_config_t, compare_dn_on_server), OR_AUTHCFG,
  +                 (void *)APR_XtOffsetOf(mod_auth_ldap_config_t, compare_dn_on_server),
OR_AUTHCFG,
                    "Set to 'on' to force auth_ldap to do DN compares (for the \"require dn\"
"
                    "directive) using the server, and set it 'off' to do the compares locally
"
                    "(at the expense of possible false matches). See the documentation for
"
  @@ -784,7 +784,7 @@
                       "member and uniquemember"),
   
       AP_INIT_FLAG("AuthLDAPGroupAttributeIsDN", ap_set_flag_slot,
  -                 (void *)XtOffsetOf(mod_auth_ldap_config_t, group_attrib_is_dn), OR_AUTHCFG,
  +                 (void *)APR_XtOffsetOf(mod_auth_ldap_config_t, group_attrib_is_dn), OR_AUTHCFG,
                    "If set to 'on', auth_ldap uses the DN that is retrieved from the server
for"
                    "subsequent group comparisons. If set to 'off', auth_ldap uses the string"
                    "provided by the client directly. Defaults to 'on'."),
  @@ -795,16 +795,16 @@
                     "Defaults to always."),
   
       AP_INIT_FLAG("AuthLDAPEnabled", ap_set_flag_slot,
  -                 (void *)XtOffsetOf(mod_auth_ldap_config_t, enabled), OR_AUTHCFG,
  +                 (void *)APR_XtOffsetOf(mod_auth_ldap_config_t, enabled), OR_AUTHCFG,
                    "Set to off to disable auth_ldap, even if it's been enabled in a higher
tree"),
    
       AP_INIT_FLAG("AuthLDAPFrontPageHack", ap_set_flag_slot,
  -                 (void *)XtOffsetOf(mod_auth_ldap_config_t, frontpage_hack), OR_AUTHCFG,
  +                 (void *)APR_XtOffsetOf(mod_auth_ldap_config_t, frontpage_hack), OR_AUTHCFG,
                    "Set to 'on' to support Microsoft FrontPage"),
   
   #ifdef APU_HAS_LDAP_STARTTLS
       AP_INIT_FLAG("AuthLDAPStartTLS", ap_set_flag_slot,
  -                 (void *)XtOffsetOf(mod_auth_ldap_config_t, starttls), OR_AUTHCFG,
  +                 (void *)APR_XtOffsetOf(mod_auth_ldap_config_t, starttls), OR_AUTHCFG,
                    "Set to 'on' to start TLS after connecting to the LDAP server."),
   #endif /* APU_HAS_LDAP_STARTTLS */
   
  
  
  
  1.85      +1 -1      httpd-2.0/modules/generators/mod_autoindex.c
  
  Index: mod_autoindex.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/generators/mod_autoindex.c,v
  retrieving revision 1.84
  retrieving revision 1.85
  diff -u -r1.84 -r1.85
  --- mod_autoindex.c	2001/08/14 19:46:21	1.84
  +++ mod_autoindex.c	2001/08/19 05:48:18	1.85
  @@ -585,7 +585,7 @@
       AP_INIT_RAW_ARGS("FancyIndexing", ap_set_deprecated, NULL, OR_ALL,
                    "The FancyIndexing directive is no longer supported.  Use IndexOptions
FancyIndexing."),
       AP_INIT_TAKE1("DefaultIcon", ap_set_string_slot,
  -                  (void *) XtOffsetOf(autoindex_config_rec, default_icon),
  +                  (void *) APR_XtOffsetOf(autoindex_config_rec, default_icon),
                     DIR_CMD_PERMS, "an icon URL"),
       {NULL}
   };
  
  
  
  1.55      +3 -3      httpd-2.0/modules/http/mod_mime.c
  
  Index: mod_mime.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/http/mod_mime.c,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- mod_mime.c	2001/08/16 21:23:29	1.54
  +++ mod_mime.c	2001/08/19 05:48:18	1.55
  @@ -464,10 +464,10 @@
   AP_INIT_ITERATE2("AddType", add_type, NULL, OR_FILEINFO, 
        "a mime type followed by one or more file extensions"),
   AP_INIT_TAKE1("DefaultLanguage", ap_set_string_slot,
  -     (void*)XtOffsetOf(mime_dir_config, default_language), OR_FILEINFO,
  +     (void*)APR_XtOffsetOf(mime_dir_config, default_language), OR_FILEINFO,
        "language to use for documents with no other language file extension"),
   AP_INIT_TAKE1("ForceType", ap_set_string_slot_lower, 
  -     (void *)XtOffsetOf(mime_dir_config, type), OR_FILEINFO,
  +     (void *)APR_XtOffsetOf(mime_dir_config, type), OR_FILEINFO,
        "a media type"),
   AP_INIT_ITERATE("RemoveCharset", remove_charset, NULL, OR_FILEINFO,
        "one or more file extensions"),
  @@ -480,7 +480,7 @@
   AP_INIT_ITERATE("RemoveType", remove_type, NULL, OR_FILEINFO,
        "one or more file extensions"),
   AP_INIT_TAKE1("SetHandler", ap_set_string_slot_lower, 
  -     (void *)XtOffsetOf(mime_dir_config, handler), OR_FILEINFO,
  +     (void *)APR_XtOffsetOf(mime_dir_config, handler), OR_FILEINFO,
        "a handler name"),
   AP_INIT_TAKE1("TypesConfig", set_types_config, NULL, RSRC_CONF,
        "the MIME types config file"),
  
  
  
  1.34      +3 -3      httpd-2.0/modules/mappers/mod_imap.c
  
  Index: mod_imap.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_imap.c,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- mod_imap.c	2001/07/28 01:29:41	1.33
  +++ mod_imap.c	2001/08/19 05:48:19	1.34
  @@ -163,15 +163,15 @@
   static const command_rec imap_cmds[] =
   {
       AP_INIT_TAKE1("ImapMenu", ap_set_string_slot,
  -                  (void *) XtOffsetOf(imap_conf_rec, imap_menu), OR_INDEXES,
  +                  (void *) APR_XtOffsetOf(imap_conf_rec, imap_menu), OR_INDEXES,
                     "the type of menu generated: none, formatted, semiformatted, "
                     "unformatted"),
       AP_INIT_TAKE1("ImapDefault", ap_set_string_slot,
  -                  (void *) XtOffsetOf(imap_conf_rec, imap_default), OR_INDEXES,
  +                  (void *) APR_XtOffsetOf(imap_conf_rec, imap_default), OR_INDEXES,
                     "the action taken if no match: error, nocontent, referer, "
                     "menu, URL"),
       AP_INIT_TAKE1("ImapBase", ap_set_string_slot,
  -                  (void *) XtOffsetOf(imap_conf_rec, imap_base), OR_INDEXES,
  +                  (void *) APR_XtOffsetOf(imap_conf_rec, imap_base), OR_INDEXES,
                     "the base for all URL's: map, referer, URL (or start of)"),
       {NULL}
   };
  
  
  
  1.29      +6 -6      httpd-2.0/modules/metadata/mod_unique_id.c
  
  Index: mod_unique_id.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/metadata/mod_unique_id.c,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- mod_unique_id.c	2001/02/16 04:26:41	1.28
  +++ mod_unique_id.c	2001/08/19 05:48:19	1.29
  @@ -63,7 +63,7 @@
    * UUencoding modified by: Alvaro Martinez Echevarria <alvaro@lander.es>
    */
   
  -#include "apr_general.h"    /* for XtOffsetOf                */
  +#include "apr_general.h"    /* for APR_XtOffsetOf                */
   
   #include "httpd.h"
   #include "http_config.h"
  @@ -187,15 +187,15 @@
       /*
        * Calculate the sizes and offsets in cur_unique_id.
        */
  -    unique_id_rec_offset[0] = XtOffsetOf(unique_id_rec, stamp);
  +    unique_id_rec_offset[0] = APR_XtOffsetOf(unique_id_rec, stamp);
       unique_id_rec_size[0] = sizeof(cur_unique_id.stamp);
  -    unique_id_rec_offset[1] = XtOffsetOf(unique_id_rec, in_addr);
  +    unique_id_rec_offset[1] = APR_XtOffsetOf(unique_id_rec, in_addr);
       unique_id_rec_size[1] = sizeof(cur_unique_id.in_addr);
  -    unique_id_rec_offset[2] = XtOffsetOf(unique_id_rec, pid);
  +    unique_id_rec_offset[2] = APR_XtOffsetOf(unique_id_rec, pid);
       unique_id_rec_size[2] = sizeof(cur_unique_id.pid);
  -    unique_id_rec_offset[3] = XtOffsetOf(unique_id_rec, counter);
  +    unique_id_rec_offset[3] = APR_XtOffsetOf(unique_id_rec, counter);
       unique_id_rec_size[3] = sizeof(cur_unique_id.counter);
  -    unique_id_rec_offset[4] = XtOffsetOf(unique_id_rec, thread_index);
  +    unique_id_rec_offset[4] = APR_XtOffsetOf(unique_id_rec, thread_index);
       unique_id_rec_size[4] = sizeof(cur_unique_id.thread_index);
       unique_id_rec_total_size = unique_id_rec_size[0] + unique_id_rec_size[1] +
                                  unique_id_rec_size[2] + unique_id_rec_size[3] +
  
  
  
  1.14      +1 -1      httpd-2.0/modules/test/mod_autoindex.c
  
  Index: mod_autoindex.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/test/mod_autoindex.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- mod_autoindex.c	2001/08/11 04:04:13	1.13
  +++ mod_autoindex.c	2001/08/19 05:48:19	1.14
  @@ -582,7 +582,7 @@
       AP_INIT_FLAG("FancyIndexing", fancy_indexing, NULL, DIR_CMD_PERMS,
                    "Limited to 'on' or 'off' (superseded by IndexOptions FancyIndexing)"),
       AP_INIT_TAKE1("DefaultIcon", ap_set_string_slot,
  -                  (void *) XtOffsetOf(autoindex_config_rec, default_icon),
  +                  (void *) APR_XtOffsetOf(autoindex_config_rec, default_icon),
                     DIR_CMD_PERMS, "an icon URL"),
       {NULL}
   };
  
  
  
  1.37      +9 -9      httpd-2.0/server/core.c
  
  Index: core.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/core.c,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- core.c	2001/08/13 04:57:34	1.36
  +++ core.c	2001/08/19 05:48:19	1.37
  @@ -2709,7 +2709,7 @@
   AP_INIT_RAW_ARGS("<FilesMatch", filesection, (void*)1, OR_ALL,
     "Container for directives affecting files matching specified patterns"),
   AP_INIT_TAKE1("AuthType", ap_set_string_slot,
  -  (void*)XtOffsetOf(core_dir_config, ap_auth_type), OR_AUTHCFG, 
  +  (void*)APR_XtOffsetOf(core_dir_config, ap_auth_type), OR_AUTHCFG, 
     "An HTTP authorization type (e.g., \"Basic\")"),
   AP_INIT_TAKE1("AuthName", set_authname, NULL, OR_AUTHCFG,
     "The authentication realm (e.g. \"Members Only\")"),
  @@ -2738,7 +2738,7 @@
   AP_INIT_RAW_ARGS("Options", set_options, NULL, OR_OPTIONS,
     "Set a number of attributes for a given directory"),
   AP_INIT_TAKE1("DefaultType", ap_set_string_slot,
  -  (void*)XtOffsetOf (core_dir_config, ap_default_type),
  +  (void*)APR_XtOffsetOf (core_dir_config, ap_default_type),
     OR_FILEINFO, "the default MIME type for untypable files"),
   
   /* Old server config file commands */
  @@ -2749,17 +2749,17 @@
     "\"on\" to enable, \"off\" to disable reverse DNS lookups, or \"double\" to "
     "enable double-reverse DNS lookups"),
   AP_INIT_TAKE1("ServerAdmin", set_server_string_slot,
  -  (void *)XtOffsetOf (server_rec, server_admin), RSRC_CONF,
  +  (void *)APR_XtOffsetOf (server_rec, server_admin), RSRC_CONF,
     "The email address of the server administrator"),
   AP_INIT_TAKE1("ServerName", set_server_string_slot,
  -  (void *)XtOffsetOf (server_rec, server_hostname), RSRC_CONF,
  +  (void *)APR_XtOffsetOf (server_rec, server_hostname), RSRC_CONF,
     "The hostname of the server"),
   AP_INIT_TAKE1("ServerSignature", set_signature_flag, NULL, OR_ALL,
     "En-/disable server signature (on|off|email)"),
   AP_INIT_TAKE1("ServerRoot", set_server_root, NULL, RSRC_CONF,
     "Common directory of server-related files (logs, confs, etc.)"),
   AP_INIT_TAKE1("ErrorLog", set_server_string_slot,
  -  (void *)XtOffsetOf (server_rec, error_fname), RSRC_CONF,
  +  (void *)APR_XtOffsetOf (server_rec, error_fname), RSRC_CONF,
     "The filename of the error log"),
   AP_INIT_RAW_ARGS("ServerAlias", set_server_alias, NULL, RSRC_CONF,
     "A name or names alternately used to access the server"),
  @@ -2802,7 +2802,7 @@
   AP_INIT_TAKE1("LimitRequestFields", set_limit_req_fields, NULL, RSRC_CONF,
     "Limit (0 = unlimited) on max number of header fields in a request message"),
   AP_INIT_TAKE1("LimitRequestBody", set_limit_req_body,
  -  (void*)XtOffsetOf(core_dir_config, limit_req_body), OR_ALL,
  +  (void*)APR_XtOffsetOf(core_dir_config, limit_req_body), OR_ALL,
     "Limit (in bytes) on maximum size of request message body"),
   AP_INIT_TAKE1("LimitXMLRequestBody", set_limit_xml_req_body, NULL, OR_ALL,
                 "Limit (in bytes) on maximum size of an XML-based request "
  @@ -2811,7 +2811,7 @@
   /* System Resource Controls */
   #ifdef RLIMIT_CPU
   AP_INIT_TAKE12("RLimitCPU", set_limit_cpu,
  -  (void*)XtOffsetOf(core_dir_config, limit_cpu),
  +  (void*)APR_XtOffsetOf(core_dir_config, limit_cpu),
     OR_ALL, "Soft/hard limits for max CPU usage in seconds"),
   #else
   AP_INIT_TAKE12("RLimitCPU", no_set_limit, NULL,
  @@ -2819,7 +2819,7 @@
   #endif
   #if defined (RLIMIT_DATA) || defined (RLIMIT_VMEM) || defined (RLIMIT_AS)
   AP_INIT_TAKE12("RLimitMEM", set_limit_mem,
  -  (void*)XtOffsetOf(core_dir_config, limit_mem),
  +  (void*)APR_XtOffsetOf(core_dir_config, limit_mem),
     OR_ALL, "Soft/hard limits for max memory usage per process"),
   #else
   AP_INIT_TAKE12("RLimitMEM", no_set_limit, NULL,
  @@ -2827,7 +2827,7 @@
   #endif
   #ifdef RLIMIT_NPROC
   AP_INIT_TAKE12("RLimitNPROC", set_limit_nproc,
  -  (void*)XtOffsetOf(core_dir_config, limit_nproc),
  +  (void*)APR_XtOffsetOf(core_dir_config, limit_nproc),
     OR_ALL, "soft/hard limits for max number of processes per uid"),
   #else
   AP_INIT_TAKE12("RLimitNPROC", no_set_limit, NULL,
  
  
  
  1.197     +1 -1      httpd-2.0/server/mpm/prefork/prefork.c
  
  Index: prefork.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/prefork/prefork.c,v
  retrieving revision 1.196
  retrieving revision 1.197
  diff -u -r1.196 -r1.197
  --- prefork.c	2001/08/16 13:59:14	1.196
  +++ prefork.c	2001/08/19 05:48:19	1.197
  @@ -918,7 +918,7 @@
   
       ap_scoreboard_image->parent[slot].pid = pid;
   #ifdef SCOREBOARD_FILE
  -    lseek(scoreboard_fd, XtOffsetOf(scoreboard, parent[slot]), 0);
  +    lseek(scoreboard_fd, APR_XtOffsetOf(scoreboard, parent[slot]), 0);
       force_write(scoreboard_fd, &ap_scoreboard_image->parent[slot],
   		sizeof(process_score));
   #endif
  
  
  

Mime
View raw message