Commit e3f513eb authored by Ralf S. Engelschall's avatar Ralf S. Engelschall
Browse files

Merge in part II of a set of mod_ssl porting changes. 

Submitted by: Madhusudan Mathihalli <madhusudan_mathihalli@hp.com>


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

modules/ssl/mod_ssl.h

+3 −1
Original line number Diff line number Diff line
@@ -684,9 +684,11 @@ void ssl_die(void); 
/*  Variables  */

void         ssl_var_register(void);

void         ssl_var_unregister(void);

char        *ssl_var_lookup(pool *, server_rec *, conn_rec *, request_rec *, char *);

#endif /* XXX */

char        *ssl_var_lookup(apr_pool_t *, server_rec *, conn_rec *, request_rec *, char *);



/*  I/O  */

#if 0 /* XXX */

void         ssl_io_register(void);

void         ssl_io_unregister(void);

long         ssl_io_data_cb(BIO *, int, const char *, int, long, long);

modules/ssl/ssl_engine_vars.c

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ void ssl_var_unregister(void) 


#if 0 /* XXX */



char *ssl_var_lookup(pool *p, server_rec *s, conn_rec *c, request_rec *r, char *var)

char *ssl_var_lookup(apr_pool_t *p, server_rec *s, conn_rec *c, request_rec *r, char *var)

{

    SSLModConfigRec *mc = myModConfig();

    char *result;

modules/ssl/ssl_expr.c

+2 −7
Original line number Diff line number Diff line
@@ -62,8 +62,6 @@ 
                                          -- Unknown  */

#include "mod_ssl.h"



#if 0 /* XXX */



/*  _________________________________________________________________

**

**  Expression Handling
@@ -73,7 +71,7 @@ 
ssl_expr_info_type ssl_expr_info;

char              *ssl_expr_error;



ssl_expr *ssl_expr_comp(pool *p, char *expr)

ssl_expr *ssl_expr_comp(apr_pool_t *p, char *expr)

{

    ssl_expr_info.pool       = p;

    ssl_expr_info.inputbuf   = expr;
@@ -98,7 +96,7 @@ ssl_expr *ssl_expr_make(ssl_expr_node_op op, void *a1, void *a2) 
{

    ssl_expr *node;



    node = (ssl_expr *)ap_palloc(ssl_expr_info.pool, sizeof(ssl_expr));

    node = (ssl_expr *)apr_palloc(ssl_expr_info.pool, sizeof(ssl_expr));

    node->node_op   = op;

    node->node_arg1 = (char *)a1;

    node->node_arg2 = (char *)a2;
@@ -115,6 +113,3 @@ int ssl_expr_exec(request_rec *r, ssl_expr *expr) 
    else

        return (rc ? 1 : 0);

}
 


#endif /* XXX */

modules/ssl/ssl_expr_eval.c

+17 −18
Original line number Diff line number Diff line
@@ -61,8 +61,6 @@ 
                                        -- Unknown */

#include "mod_ssl.h"



#if 0 /* XXX */



/*  _________________________________________________________________

**

**  Expression Evaluation
@@ -223,35 +221,39 @@ static char *ssl_expr_eval_word(request_rec *r, ssl_expr *node) 


static char *ssl_expr_eval_func_file(request_rec *r, char *filename)

{

    FILE *fp;

    apr_file_t *fp;

    char *buf;

    int len;

    apr_off_t offset;

    apr_size_t len;

    apr_finfo_t finfo;



    if ((fp = ap_pfopen(r->pool, filename, "r")) == NULL) {

    if (apr_file_open(&fp, filename, APR_READ|APR_BUFFERED, 

                      APR_OS_DEFAULT, r->pool) != APR_SUCCESS) {

        ssl_expr_error = "Cannot open file";

        return "";

    }

    fseek(fp, 0, SEEK_END);

    len = ftell(fp);

    apr_file_info_get(&finfo, APR_FINFO_SIZE, fp);

    len = finfo.size;

    if (len == 0) {

        buf = (char *)ap_palloc(r->pool, sizeof(char) * 1);

        buf = (char *)apr_palloc(r->pool, sizeof(char) * 1);

        *buf = NUL;

    }

    else {

        if ((buf = (char *)ap_palloc(r->pool, sizeof(char) * len+1)) == NULL) {

        if ((buf = (char *)apr_palloc(r->pool, sizeof(char)*(len+1))) == NULL) {

            ssl_expr_error = "Cannot allocate memory";

            ap_pfclose(r->pool, fp);

            apr_file_close(fp);

            return "";

        }

        fseek(fp, 0, SEEK_SET);

        if (fread(buf, len, 1, fp) == 0) {

        offset = 0;

        apr_file_seek(fp, APR_SET, &offset);

        if (apr_file_read(fp, buf, &len) != APR_SUCCESS) {

            ssl_expr_error = "Cannot read from file";

            fclose(fp);

            return ("");

            apr_file_close(fp);

            return "";

        }

        buf[len] = NUL;

    }

    ap_pfclose(r->pool, fp);

    apr_file_close(fp);

    return buf;

}
@@ -278,6 +280,3 @@ static int ssl_expr_eval_strcmplex(char *cpNum1, char *cpNum2) 
    }

    return 0;

}
 


#endif /* XXX */