Commit 3e6be42d authored by Doug MacEachern's avatar Doug MacEachern
Browse files

Add ap_set_int_slot() function 

PR:
Obtained from:
Submitted by:	John K. Sterling <sterling@covalent.net>
Reviewed by:	dougm


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88902 13f79535-47bb-0310-9956-ffa450edef68
parent f1a7b15e

CHANGES

+3 −0
Original line number Diff line number Diff line 
Changes with Apache 2.0.18-dev



  *) Add ap_set_int_slot() function

     [John K. Sterling <sterling@covalent.net>]



  *) Under certain circumstances, Apache did not supply the

     right response headers when requiring authentication.

     [Gertjan van Wingerde <Gertjan.van.Wingerde@cmg.nl>] PR#7114

include/http_config.h

+12 −0
Original line number Diff line number Diff line
@@ -482,6 +482,18 @@ AP_DECLARE(void) ap_set_module_config(ap_conf_vector_t *cv, const module *m, 
AP_DECLARE_NONSTD(const char *) ap_set_string_slot(cmd_parms *cmd, void *struct_ptr,

						   const char *arg);



/**

 * Generic command handling function for integers

 * @param cmd The command parameters for this directive

 * @param struct_ptr pointer into a given type

 * @param arg The argument to the directive

 * @return An error string or NULL on success

 * @deffunc const char *ap_set_int_slot(cmd_parms *cmd, void *struct_ptr, const char *arg)

 */

AP_DECLARE_NONSTD(const char *) ap_set_int_slot(cmd_parms *cmd, 

                                                void *struct_ptr,

                                                const char *arg);



/**

 * Return true if the specified method is limited by being listed in

 * a <Limit> container, or by *not* being listed in a <LimiteExcept>

server/config.c

+19 −0
Original line number Diff line number Diff line
@@ -1061,6 +1061,25 @@ AP_DECLARE_NONSTD(const char *) ap_set_string_slot(cmd_parms *cmd, 
    return NULL;

}



AP_DECLARE_NONSTD(const char *) ap_set_int_slot(cmd_parms *cmd,

                                                void *struct_ptr,

                                                const char *arg)

{

    char *endptr;

    char *error_str = NULL;

    int offset = (int) (long) cmd->info;



    *(int *) (struct_ptr + offset) = strtol(arg, &endptr, 10);



    if ((*arg == '\0') || (*endptr != '\0')) {

        error_str = apr_psprintf(cmd->pool, 

                     "Invalid value for directive %s, expected integer",

                     cmd->directive->directive);

    }



    return error_str;

}



AP_DECLARE_NONSTD(const char *) ap_set_string_slot_lower(cmd_parms *cmd,

							 void *struct_ptr,

							 const char *arg_)

support/httpd.exp

+1 −0
Original line number Diff line number Diff line
@@ -319,6 +319,7 @@ ap_set_content_length 
ap_set_etag

ap_set_file_slot

ap_set_flag_slot

ap_set_int_slot

ap_set_keepalive

ap_set_last_modified

ap_set_listenbacklog