Commit d0e6b917 authored by Stefan Fritsch's avatar Stefan Fritsch
Browse files

break some very long lines, no code change 


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

modules/session/mod_session_cookie.c

+18 −8
Changes for modules/session/mod_session_cookie.c: 18 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -67,20 +67,26 @@ static int session_cookie_save(request_rec * r, session_rec * z) 
    /* create RFC2109 compliant cookie */

    if (conf->name_set) {

        if (z->encoded && z->encoded[0]) {

            ap_cookie_write(r, conf->name, z->encoded, conf->name_attrs, z->maxage, r->headers_out, r->err_headers_out, NULL);

            ap_cookie_write(r, conf->name, z->encoded, conf->name_attrs,

                            z->maxage, r->headers_out, r->err_headers_out,

                            NULL);

        }

        else {

            ap_cookie_remove(r, conf->name, conf->name_attrs, r->headers_out, r->err_headers_out, NULL);

            ap_cookie_remove(r, conf->name, conf->name_attrs, r->headers_out,

                             r->err_headers_out, NULL);

        }

    }



    /* create RFC2965 compliant cookie */

    if (conf->name2_set) {

        if (z->encoded && z->encoded[0]) {

            ap_cookie_write2(r, conf->name2, z->encoded, conf->name2_attrs, z->maxage, r->headers_out, r->err_headers_out, NULL);

            ap_cookie_write2(r, conf->name2, z->encoded, conf->name2_attrs,

                             z->maxage, r->headers_out, r->err_headers_out,

                             NULL);

        }

        else {

            ap_cookie_remove2(r, conf->name2, conf->name2_attrs, r->headers_out, r->err_headers_out, NULL);

            ap_cookie_remove2(r, conf->name2, conf->name2_attrs,

                              r->headers_out, r->err_headers_out, NULL);

        }

    }
@@ -172,9 +178,11 @@ static void *create_session_cookie_dir_config(apr_pool_t * p, char *dummy) 
    return (void *) new;

}



static void *merge_session_cookie_dir_config(apr_pool_t * p, void *basev, void *addv)

static void *merge_session_cookie_dir_config(apr_pool_t * p, void *basev,

                                             void *addv)

{

    session_cookie_dir_conf *new = (session_cookie_dir_conf *) apr_pcalloc(p, sizeof(session_cookie_dir_conf));

    session_cookie_dir_conf *new = (session_cookie_dir_conf *)

                                apr_pcalloc(p, sizeof(session_cookie_dir_conf));

    session_cookie_dir_conf *add = (session_cookie_dir_conf *) addv;

    session_cookie_dir_conf *base = (session_cookie_dir_conf *) basev;
@@ -204,7 +212,8 @@ static const char *check_string(cmd_parms * cmd, const char *string) 
    return NULL;

}



static const char *set_cookie_name(cmd_parms * cmd, void *config, const char *args)

static const char *set_cookie_name(cmd_parms * cmd, void *config,

                                   const char *args)

{

    char *last;

    char *line = apr_pstrdup(cmd->pool, args);
@@ -219,7 +228,8 @@ static const char *set_cookie_name(cmd_parms * cmd, void *config, const char *ar 
    return check_string(cmd, cookie);

}



static const char *set_cookie_name2(cmd_parms * cmd, void *config, const char *args)

static const char *set_cookie_name2(cmd_parms * cmd, void *config,

                                    const char *args)

{

    char *last;

    char *line = apr_pstrdup(cmd->pool, args);

modules/session/mod_session_crypto.c

+18 −8
Changes for modules/session/mod_session_crypto.c: 18 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -77,7 +77,11 @@ AP_DECLARE(int) ap_session_crypto_init(apr_pool_t *p, apr_pool_t *plog, 
 *

 * Returns APR_SUCCESS if successful.

 */

static apr_status_t crypt_init(request_rec * r, const apr_crypto_driver_t *driver, apr_crypto_t **f, apr_crypto_key_t **key, apr_uuid_t *salt, apr_size_t *ivSize, session_crypto_dir_conf * dconf)

static apr_status_t crypt_init(request_rec * r,

                               const apr_crypto_driver_t *driver,

                               apr_crypto_t **f, apr_crypto_key_t **key,

                               apr_uuid_t *salt, apr_size_t *ivSize,

                               session_crypto_dir_conf * dconf)

{

    apr_status_t res;
@@ -110,8 +114,8 @@ static apr_status_t crypt_init(request_rec * r, const apr_crypto_driver_t *drive 
        res = apr_crypto_passphrase(r->pool, *f, dconf->passphrase,

#endif

                strlen(dconf->passphrase),

                (unsigned char *) salt, salt ? sizeof(apr_uuid_t) : 0, dconf->cipher,

                MODE_CBC, 1, 4096, key, ivSize);

                (unsigned char *) salt, salt ? sizeof(apr_uuid_t) : 0,

                dconf->cipher, MODE_CBC, 1, 4096, key, ivSize);

    }



    if (APR_STATUS_IS_ENOKEY(res)) {
@@ -141,7 +145,8 @@ static apr_status_t crypt_init(request_rec * r, const apr_crypto_driver_t *drive 
 *

 * Returns APR_SUCCESS if successful.

 */

static apr_status_t encrypt_string(request_rec * r, const apr_crypto_driver_t *driver,

static apr_status_t encrypt_string(request_rec * r,

                                   const apr_crypto_driver_t *driver,

                                   session_crypto_dir_conf *dconf,

                                   const char *in, char **out)

{
@@ -217,8 +222,11 @@ static apr_status_t encrypt_string(request_rec * r, const apr_crypto_driver_t *d 
    memcpy(combined + sizeof(apr_uuid_t) + ivSize, encrypt, encryptlen);



    /* base64 encode the result */

    base64 = apr_palloc(r->pool, apr_base64_encode_len(ivSize + encryptlen + sizeof(apr_uuid_t) + 1) * sizeof(char));

    apr_base64_encode(base64, (const char *) combined, ivSize + encryptlen + sizeof(apr_uuid_t));

    base64 = apr_palloc(r->pool, apr_base64_encode_len(ivSize + encryptlen +

                                                       sizeof(apr_uuid_t) + 1)

                                 * sizeof(char));

    apr_base64_encode(base64, (const char *) combined,

                      ivSize + encryptlen + sizeof(apr_uuid_t));

    *out = base64;



    return res;
@@ -230,7 +238,8 @@ static apr_status_t encrypt_string(request_rec * r, const apr_crypto_driver_t *d 
 *

 * Returns APR_SUCCESS if successful.

 */

static apr_status_t decrypt_string(request_rec * r, const apr_crypto_driver_t *driver,

static apr_status_t decrypt_string(request_rec * r,

                                   const apr_crypto_driver_t *driver,

                                   session_crypto_dir_conf *dconf,

                                   const char *in, char **out)

{
@@ -360,7 +369,8 @@ AP_DECLARE(int) ap_session_crypto_decode(request_rec * r, session_rec * z) 
            &session_crypto_module);



    if ((dconf->passphrase_set) && z->encoded && *z->encoded) {

        apr_pool_userdata_get((void **)&driver, DRIVER_KEY, r->server->process->pconf);

        apr_pool_userdata_get((void **)&driver, DRIVER_KEY,

                              r->server->process->pconf);

        res = decrypt_string(r, driver, dconf, z->encoded, &encoded);

        if (res != APR_SUCCESS) {

            ap_log_rerror(APLOG_MARK, APLOG_ERR, res, r, LOG_PREFIX

modules/session/mod_session_dbd.c

+10 −5
Changes for modules/session/mod_session_dbd.c: 10 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -251,7 +251,8 @@ static int session_dbd_load(request_rec * r, session_rec ** z) 
/**

 * Save the session by the key specified.

 */

static apr_status_t dbd_save(request_rec * r, const char *key, const char *val, apr_int64_t expiry)

static apr_status_t dbd_save(request_rec * r, const char *key, const char *val,

                             apr_int64_t expiry)

{



    apr_status_t rv;
@@ -352,11 +353,13 @@ static apr_status_t dbd_remove(request_rec * r, const char *key) 
        return APR_EGENERAL;

    }



    statement = apr_hash_get(dbd->prepared, conf->deletelabel, APR_HASH_KEY_STRING);

    statement = apr_hash_get(dbd->prepared, conf->deletelabel,

                             APR_HASH_KEY_STRING);

    if (statement == NULL) {

        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, LOG_PREFIX

                      "prepared statement could not be found for "

                      "SessionDBDdeletelabel with the label '%s'", conf->deletelabel);

                      "SessionDBDdeletelabel with the label '%s'",

                      conf->deletelabel);

        return APR_EGENERAL;

    }

    rv = apr_dbd_pvbquery(dbd->driver, r->pool, dbd->handle, &rows, statement,
@@ -431,12 +434,14 @@ static int session_dbd_save(request_rec * r, session_rec * z) 


        /* create RFC2109 compliant cookie */

        if (conf->name_set) {

            ap_cookie_write(r, conf->name, buffer, conf->name_attrs, z->maxage, r->headers_out, r->err_headers_out, NULL);

            ap_cookie_write(r, conf->name, buffer, conf->name_attrs, z->maxage,

                            r->headers_out, r->err_headers_out, NULL);

        }



        /* create RFC2965 compliant cookie */

        if (conf->name2_set) {

            ap_cookie_write2(r, conf->name2, buffer, conf->name2_attrs, z->maxage, r->headers_out, r->err_headers_out, NULL);

            ap_cookie_write2(r, conf->name2, buffer, conf->name2_attrs, z->maxage,

                             r->headers_out, r->err_headers_out, NULL);

        }



        return OK;