You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by gs...@apache.org on 2001/02/18 04:18:35 UTC

cvs commit: httpd-2.0/modules/http mod_core.h

gstein      01/02/17 19:18:35

  Modified:    include  http_core.h http_protocol.h
               modules/http mod_core.h
  Log:
  shift some declarations over to mod_core.h where they're totally private.
  
  Revision  Changes    Path
  1.40      +25 -13    httpd-2.0/include/http_core.h
  
  Index: http_core.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/include/http_core.h,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -u -r1.39 -r1.40
  --- http_core.h	2001/02/16 04:26:30	1.39
  +++ http_core.h	2001/02/18 03:18:35	1.40
  @@ -137,21 +137,24 @@
    * @return the Options bitmask
    * @deffunc int ap_allow_options(request_rec *r)
    */
  -AP_DECLARE(int) ap_allow_options (request_rec *r);
  +AP_DECLARE(int) ap_allow_options(request_rec *r);
  +
   /**
    * Retrieve the value of the AllowOverride for this request
    * @param r The current request
    * @return the overrides bitmask
    * @deffunc int ap_allow_overrides(request_rec *r)
    */
  -AP_DECLARE(int) ap_allow_overrides (request_rec *r);
  +AP_DECLARE(int) ap_allow_overrides(request_rec *r);
  +
   /**
    * Retrieve the value of the DefaultType directive, or text/plain if not set
    * @param r The current request
    * @return The default type
    * @deffunc const char *ap_default_type(request_rec *r)
    */
  -AP_DECLARE(const char *) ap_default_type (request_rec *r);     
  +AP_DECLARE(const char *) ap_default_type(request_rec *r);     
  +
   /**
    * Retrieve the document root for this server
    * @param r The current request
  @@ -160,7 +163,8 @@
    * @return The document root
    * @deffunc const char *ap_document_root(request_rec *r)
    */
  -AP_DECLARE(const char *) ap_document_root (request_rec *r);
  +AP_DECLARE(const char *) ap_document_root(request_rec *r);
  +
   /**
    * Lookup the remote client's DNS name or IP address
    * @param conn The current connection
  @@ -184,6 +188,7 @@
    * @deffunc const char *ap_get_remote_host(conn_rec *conn, void *dir_config, int type)
    */
   AP_DECLARE(const char *) ap_get_remote_host(conn_rec *conn, void *dir_config, int type);
  +
   /**
    * Retrieve the login name of the remote user.  Undef if it could not be
    * determined
  @@ -205,6 +210,7 @@
    * @deffunc char *ap_construct_url(apr_pool_t *p, const char *uri, request_rec *r)
    */
   AP_DECLARE(char *) ap_construct_url(apr_pool_t *p, const char *uri, request_rec *r);
  +
   /**
    * Get the current server name from the request
    * @param r The current request
  @@ -212,6 +218,7 @@
    * @deffunc const char *ap_get_server_name(request_rec *r)
    */
   AP_DECLARE(const char *) ap_get_server_name(request_rec *r);
  +
   /**
    * Get the current server port
    * @param The current request
  @@ -219,6 +226,7 @@
    * @deffunc apr_port_t ap_get_server_port(const request_rec *r)
    */
   AP_DECLARE(apr_port_t) ap_get_server_port(const request_rec *r);
  +
   /**
    * Return the limit on bytes in request msg body 
    * @param r The current request
  @@ -226,6 +234,7 @@
    * @deffunc unsigned long ap_get_limit_req_body(const request_rec *r)
    */
   AP_DECLARE(unsigned long) ap_get_limit_req_body(const request_rec *r);
  +
   /**
    * Return the limit on bytes in XML request msg body
    * @param r The current request
  @@ -233,6 +242,7 @@
    * @deffunc size_t ap_get_limit_xml_body(const request_rec *r)
    */
   AP_DECLARE(size_t) ap_get_limit_xml_body(const request_rec *r);
  +
   /**
    * Install a custom response handler for a given status
    * @param r The current request
  @@ -242,6 +252,7 @@
    * @deffunc void ap_custom_response(request_rec *r, int status, char *string)
    */
   AP_DECLARE(void) ap_custom_response(request_rec *r, int status, char *string);
  +
   /**
    * Check for a definition from the server command line
    * @param name The define to check for
  @@ -274,14 +285,16 @@
    * @return The authorization required
    * @deffunc const char *ap_auth_type(request_rec *r)
    */
  -AP_DECLARE(const char *) ap_auth_type (request_rec *r);
  +AP_DECLARE(const char *) ap_auth_type(request_rec *r);
  +
   /**
    * Return the current Authorization realm
    * @param r The current request
    * @return The current authorization realm
    * @deffunc const char *ap_auth_name(request_rec *r)
    */
  -AP_DECLARE(const char *) ap_auth_name (request_rec *r);     
  +AP_DECLARE(const char *) ap_auth_name(request_rec *r);     
  +
   /**
    * How the requires lines must be met.
    * @param r The current request
  @@ -293,14 +306,15 @@
    * </PRE>
    * @deffunc int ap_satisfies(request_rec *r)
    */
  -AP_DECLARE(int) ap_satisfies (request_rec *r);
  +AP_DECLARE(int) ap_satisfies(request_rec *r);
  +
   /**
    * Retrieve information about all of the requires directives for this request
    * @param r The current request
    * @return An array of all requires directives for this request
    * @deffunc const apr_array_header_t *ap_requires(request_rec *r)
    */
  -AP_DECLARE(const apr_array_header_t *) ap_requires (request_rec *r);    
  +AP_DECLARE(const apr_array_header_t *) ap_requires(request_rec *r);    
   
   #if defined(WIN32)
   /* 
  @@ -324,8 +338,6 @@
    * the code that cares really is in http_core.c.  Also, another accessor.
    */
   
  -char *ap_response_code_string (request_rec *r, int error_index);
  -
   AP_DECLARE_DATA extern module core_module;
   
   /* Per-request configuration */
  @@ -469,10 +481,10 @@
   void ap_core_reorder_directories(apr_pool_t *, server_rec *);
   
   /* for mod_perl */
  -AP_CORE_DECLARE(void) ap_add_per_dir_conf (server_rec *s, void *dir_config);
  -AP_CORE_DECLARE(void) ap_add_per_url_conf (server_rec *s, void *url_config);
  +AP_CORE_DECLARE(void) ap_add_per_dir_conf(server_rec *s, void *dir_config);
  +AP_CORE_DECLARE(void) ap_add_per_url_conf(server_rec *s, void *url_config);
   AP_CORE_DECLARE(void) ap_add_file_conf(core_dir_config *conf, void *url_config);
  -AP_CORE_DECLARE_NONSTD(const char *) ap_limit_section (cmd_parms *cmd, void *dummy, const char *arg);
  +AP_CORE_DECLARE_NONSTD(const char *) ap_limit_section(cmd_parms *cmd, void *dummy, const char *arg);
   
   #endif
   
  
  
  
  1.56      +0 -12     httpd-2.0/include/http_protocol.h
  
  Index: http_protocol.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/include/http_protocol.h,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -u -r1.55 -r1.56
  --- http_protocol.h	2001/02/18 02:58:49	1.55
  +++ http_protocol.h	2001/02/18 03:18:35	1.56
  @@ -103,11 +103,7 @@
    */
   AP_DECLARE(void) ap_send_http_header(request_rec *r);
   
  -/* Send the response to special method requests */
   
  -AP_DECLARE(int) ap_send_http_trace(request_rec *r);
  -int ap_send_http_options(request_rec *r);
  -
   /* Finish up stuff after a request */
   
   /**
  @@ -483,14 +479,6 @@
    * @deffunc int ap_get_basic_auth_pw(request_rec *r, const char **pw)
    */
   AP_DECLARE(int) ap_get_basic_auth_pw(request_rec *r, const char **pw);
  -
  -/*
  - * Setting up the protocol fields for subsidiary requests...
  - * Also, a wrapup function to keep the internal accounting straight.
  - */
  -
  -void ap_set_sub_req_protocol(request_rec *rnew, const request_rec *r);
  -void ap_finalize_sub_req_protocol(request_rec *sub_r);
   
   /**
    * parse_uri: break apart the uri
  
  
  
  1.3       +16 -0     httpd-2.0/modules/http/mod_core.h
  
  Index: mod_core.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/http/mod_core.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -u -r1.2 -r1.3
  --- mod_core.h	2001/02/16 04:26:39	1.2
  +++ mod_core.h	2001/02/18 03:18:35	1.3
  @@ -85,6 +85,22 @@
   apr_status_t ap_http_filter(ap_filter_t *f, apr_bucket_brigade *b, ap_input_mode_t mode);
   apr_status_t ap_dechunk_filter(ap_filter_t *f, apr_bucket_brigade *b, ap_input_mode_t mode);
   
  +
  +/*
  + * Setting up the protocol fields for subsidiary requests...
  + * Also, a wrapup function to keep the internal accounting straight.
  + */
  +void ap_set_sub_req_protocol(request_rec *rnew, const request_rec *r);
  +void ap_finalize_sub_req_protocol(request_rec *sub_r);
  +
  +
  +/* Send the response to special method requests */
  +int ap_send_http_trace(request_rec *r);
  +int ap_send_http_options(request_rec *r);
  +
  +
  +char *ap_response_code_string(request_rec *r, int error_index);
  +
   #ifdef __cplusplus
   }
   #endif