[core] inline buffer key for *_patch_connection()
handle buffer key as part of DATA_UNSET in *_patch_connection() (instead of key being (buffer *))personal/stbuehler/ci-build
parent
ad9b7e009b
commit
47a758f959
|
@ -694,76 +694,76 @@ void config_patch_connection(server *srv, connection *con) {
|
|||
for (j = 0; j < dc->value->used; j++) {
|
||||
data_unset *du = dc->value->data[j];
|
||||
|
||||
if (buffer_is_equal_string(du->key, CONST_STR_LEN("server.document-root"))) {
|
||||
if (buffer_is_equal_string(&du->key, CONST_STR_LEN("server.document-root"))) {
|
||||
PATCH(document_root);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("server.range-requests"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("server.range-requests"))) {
|
||||
PATCH(range_requests);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("server.error-handler"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("server.error-handler"))) {
|
||||
PATCH(error_handler);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("server.error-handler-404"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("server.error-handler-404"))) {
|
||||
PATCH(error_handler_404);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("server.error-intercept"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("server.error-intercept"))) {
|
||||
PATCH(error_intercept);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("server.errorfile-prefix"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("server.errorfile-prefix"))) {
|
||||
PATCH(errorfile_prefix);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("mimetype.assign"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("mimetype.assign"))) {
|
||||
PATCH(mimetypes);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("server.max-keep-alive-requests"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("server.max-keep-alive-requests"))) {
|
||||
PATCH(max_keep_alive_requests);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("server.max-keep-alive-idle"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("server.max-keep-alive-idle"))) {
|
||||
PATCH(max_keep_alive_idle);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("server.max-write-idle"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("server.max-write-idle"))) {
|
||||
PATCH(max_write_idle);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("server.max-read-idle"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("server.max-read-idle"))) {
|
||||
PATCH(max_read_idle);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("server.max-request-size"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("server.max-request-size"))) {
|
||||
PATCH(max_request_size);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("mimetype.use-xattr"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("mimetype.use-xattr"))) {
|
||||
PATCH(use_xattr);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("etag.use-inode"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("etag.use-inode"))) {
|
||||
PATCH(etag_use_inode);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("etag.use-mtime"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("etag.use-mtime"))) {
|
||||
PATCH(etag_use_mtime);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("etag.use-size"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("etag.use-size"))) {
|
||||
PATCH(etag_use_size);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("server.follow-symlink"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("server.follow-symlink"))) {
|
||||
PATCH(follow_symlink);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("server.name"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("server.name"))) {
|
||||
PATCH(server_name);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("server.tag"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("server.tag"))) {
|
||||
PATCH(server_tag);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("server.stream-request-body"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("server.stream-request-body"))) {
|
||||
PATCH(stream_request_body);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("server.stream-response-body"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("server.stream-response-body"))) {
|
||||
PATCH(stream_response_body);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("connection.kbytes-per-second"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("connection.kbytes-per-second"))) {
|
||||
PATCH(kbytes_per_second);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("debug.log-request-handling"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("debug.log-request-handling"))) {
|
||||
PATCH(log_request_handling);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("debug.log-request-header"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("debug.log-request-header"))) {
|
||||
PATCH(log_request_header);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("debug.log-response-header"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("debug.log-response-header"))) {
|
||||
PATCH(log_response_header);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("debug.log-condition-handling"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("debug.log-condition-handling"))) {
|
||||
PATCH(log_condition_handling);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("debug.log-file-not-found"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("debug.log-file-not-found"))) {
|
||||
PATCH(log_file_not_found);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("debug.log-timeouts"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("debug.log-timeouts"))) {
|
||||
PATCH(log_timeouts);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("server.protocol-http11"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("server.protocol-http11"))) {
|
||||
PATCH(allow_http11);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("server.force-lowercase-filenames"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("server.force-lowercase-filenames"))) {
|
||||
PATCH(force_lowercase_filenames);
|
||||
#if 0 /*(not necessary; used only at startup)*/
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("server.listen-backlog"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("server.listen-backlog"))) {
|
||||
PATCH(listen_backlog);
|
||||
#endif
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("server.kbytes-per-second"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("server.kbytes-per-second"))) {
|
||||
PATCH(global_kbytes_per_second);
|
||||
PATCH(global_bytes_per_second_cnt);
|
||||
con->conf.global_bytes_per_second_cnt_ptr = &s->global_bytes_per_second_cnt;
|
||||
#if 0 /*(not necessary; used only at startup)*/
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("server.socket-perms"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("server.socket-perms"))) {
|
||||
PATCH(socket_perms);
|
||||
#endif
|
||||
}
|
||||
|
|
|
@ -123,9 +123,9 @@ static int mod_access_patch_connection(server *srv, connection *con, plugin_data
|
|||
for (j = 0; j < dc->value->used; j++) {
|
||||
data_unset *du = dc->value->data[j];
|
||||
|
||||
if (buffer_is_equal_string(du->key, CONST_STR_LEN("url.access-deny"))) {
|
||||
if (buffer_is_equal_string(&du->key, CONST_STR_LEN("url.access-deny"))) {
|
||||
PATCH(access_deny);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("url.access-allow"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("url.access-allow"))) {
|
||||
PATCH(access_allow);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -729,17 +729,17 @@ static int mod_accesslog_patch_connection(server *srv, connection *con, plugin_d
|
|||
for (j = 0; j < dc->value->used; j++) {
|
||||
data_unset *du = dc->value->data[j];
|
||||
|
||||
if (buffer_is_equal_string(du->key, CONST_STR_LEN("accesslog.filename"))) {
|
||||
if (buffer_is_equal_string(&du->key, CONST_STR_LEN("accesslog.filename"))) {
|
||||
PATCH(access_logfile);
|
||||
PATCH(log_access_fd);
|
||||
PATCH(access_logbuffer);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("accesslog.format"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("accesslog.format"))) {
|
||||
PATCH(parsed_format);
|
||||
PATCH(last_generated_accesslog_ts_ptr);
|
||||
PATCH(ts_accesslog_str);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("accesslog.use-syslog"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("accesslog.use-syslog"))) {
|
||||
PATCH(use_syslog);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("accesslog.syslog-level"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("accesslog.syslog-level"))) {
|
||||
PATCH(syslog_level);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -143,7 +143,7 @@ static int mod_alias_patch_connection(server *srv, connection *con, plugin_data
|
|||
for (j = 0; j < dc->value->used; j++) {
|
||||
data_unset *du = dc->value->data[j];
|
||||
|
||||
if (buffer_is_equal_string(du->key, CONST_STR_LEN("alias.url"))) {
|
||||
if (buffer_is_equal_string(&du->key, CONST_STR_LEN("alias.url"))) {
|
||||
PATCH(alias);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -447,11 +447,11 @@ static int mod_auth_patch_connection(server *srv, connection *con, plugin_data *
|
|||
for (j = 0; j < dc->value->used; j++) {
|
||||
data_unset *du = dc->value->data[j];
|
||||
|
||||
if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend"))) {
|
||||
if (buffer_is_equal_string(&du->key, CONST_STR_LEN("auth.backend"))) {
|
||||
PATCH(auth_backend);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.require"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("auth.require"))) {
|
||||
PATCH(auth_require);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.extern-authn"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("auth.extern-authn"))) {
|
||||
PATCH(auth_extern_authn);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -180,13 +180,13 @@ static int mod_authn_file_patch_connection(server *srv, connection *con, plugin_
|
|||
for (j = 0; j < dc->value->used; j++) {
|
||||
data_unset *du = dc->value->data[j];
|
||||
|
||||
if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.plain.groupfile"))) {
|
||||
if (buffer_is_equal_string(&du->key, CONST_STR_LEN("auth.backend.plain.groupfile"))) {
|
||||
PATCH(auth_plain_groupfile);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.plain.userfile"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("auth.backend.plain.userfile"))) {
|
||||
PATCH(auth_plain_userfile);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.htdigest.userfile"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("auth.backend.htdigest.userfile"))) {
|
||||
PATCH(auth_htdigest_userfile);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.htpasswd.userfile"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("auth.backend.htpasswd.userfile"))) {
|
||||
PATCH(auth_htpasswd_userfile);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -156,11 +156,11 @@ static int mod_authn_gssapi_patch_connection(server *srv, connection *con, plugi
|
|||
for (j = 0; j < dc->value->used; j++) {
|
||||
data_unset *du = dc->value->data[j];
|
||||
|
||||
if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.gssapi.keytab"))) {
|
||||
if (buffer_is_equal_string(&du->key, CONST_STR_LEN("auth.backend.gssapi.keytab"))) {
|
||||
PATCH(auth_gssapi_keytab);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.gssapi.principal"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("auth.backend.gssapi.principal"))) {
|
||||
PATCH(auth_gssapi_principal);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.gssapi.store-creds"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("auth.backend.gssapi.store-creds"))) {
|
||||
PATCH(auth_gssapi_store_creds);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -214,24 +214,24 @@ static int mod_authn_ldap_patch_connection(server *srv, connection *con, plugin_
|
|||
for (j = 0; j < dc->value->used; j++) {
|
||||
data_unset *du = dc->value->data[j];
|
||||
|
||||
if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.ldap.hostname"))) {
|
||||
if (buffer_is_equal_string(&du->key, CONST_STR_LEN("auth.backend.ldap.hostname"))) {
|
||||
PATCH(auth_ldap_hostname);
|
||||
p->anon_conf = s;
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.ldap.base-dn"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("auth.backend.ldap.base-dn"))) {
|
||||
PATCH(auth_ldap_basedn);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.ldap.filter"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("auth.backend.ldap.filter"))) {
|
||||
PATCH(auth_ldap_filter);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.ldap.ca-file"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("auth.backend.ldap.ca-file"))) {
|
||||
PATCH(auth_ldap_cafile);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.ldap.starttls"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("auth.backend.ldap.starttls"))) {
|
||||
PATCH(auth_ldap_starttls);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.ldap.bind-dn"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("auth.backend.ldap.bind-dn"))) {
|
||||
PATCH(auth_ldap_binddn);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.ldap.bind-pw"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("auth.backend.ldap.bind-pw"))) {
|
||||
PATCH(auth_ldap_bindpw);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.ldap.allow-empty-pw"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("auth.backend.ldap.allow-empty-pw"))) {
|
||||
PATCH(auth_ldap_allow_empty_pw);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.ldap.groupmember"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("auth.backend.ldap.groupmember"))) {
|
||||
PATCH(auth_ldap_groupmember);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -304,25 +304,25 @@ static int mod_authn_mysql_patch_connection(server *srv, connection *con, plugin
|
|||
for (j = 0; j < dc->value->used; j++) {
|
||||
data_unset *du = dc->value->data[j];
|
||||
|
||||
if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.mysql.host"))) {
|
||||
if (buffer_is_equal_string(&du->key, CONST_STR_LEN("auth.backend.mysql.host"))) {
|
||||
PATCH(auth_mysql_host);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.mysql.user"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("auth.backend.mysql.user"))) {
|
||||
PATCH(auth_mysql_user);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.mysql.pass"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("auth.backend.mysql.pass"))) {
|
||||
PATCH(auth_mysql_pass);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.mysql.db"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("auth.backend.mysql.db"))) {
|
||||
PATCH(auth_mysql_db);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.mysql.port"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("auth.backend.mysql.port"))) {
|
||||
PATCH(auth_mysql_port);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.mysql.socket"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("auth.backend.mysql.socket"))) {
|
||||
PATCH(auth_mysql_socket);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.mysql.users_table"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("auth.backend.mysql.users_table"))) {
|
||||
PATCH(auth_mysql_users_table);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.mysql.col_user"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("auth.backend.mysql.col_user"))) {
|
||||
PATCH(auth_mysql_col_user);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.mysql.col_pass"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("auth.backend.mysql.col_pass"))) {
|
||||
PATCH(auth_mysql_col_pass);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.mysql.col_realm"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("auth.backend.mysql.col_realm"))) {
|
||||
PATCH(auth_mysql_col_realm);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -117,7 +117,7 @@ static int mod_authn_pam_patch_connection(server *srv, connection *con, plugin_d
|
|||
s = p->config_storage[i];
|
||||
for (size_t j = 0; j < dc->value->used; ++j) {
|
||||
data_unset *du = dc->value->data[j];
|
||||
if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.pam.opts"))) {
|
||||
if (buffer_is_equal_string(&du->key, CONST_STR_LEN("auth.backend.pam.opts"))) {
|
||||
PATCH(service);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -167,7 +167,7 @@ static int mod_authn_sasl_patch_connection(server *srv, connection *con, plugin_
|
|||
s = p->config_storage[i];
|
||||
for (size_t j = 0; j < dc->value->used; ++j) {
|
||||
data_unset *du = dc->value->data[j];
|
||||
if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.sasl.opts"))) {
|
||||
if (buffer_is_equal_string(&du->key, CONST_STR_LEN("auth.backend.sasl.opts"))) {
|
||||
PATCH(service);
|
||||
PATCH(fqdn);
|
||||
PATCH(pwcheck_method);
|
||||
|
|
|
@ -884,17 +884,17 @@ static int mod_cgi_patch_connection(server *srv, connection *con, plugin_data *p
|
|||
for (j = 0; j < dc->value->used; j++) {
|
||||
data_unset *du = dc->value->data[j];
|
||||
|
||||
if (buffer_is_equal_string(du->key, CONST_STR_LEN("cgi.assign"))) {
|
||||
if (buffer_is_equal_string(&du->key, CONST_STR_LEN("cgi.assign"))) {
|
||||
PATCH(cgi);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("cgi.execute-x-only"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("cgi.execute-x-only"))) {
|
||||
PATCH(execute_x_only);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("cgi.local-redir"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("cgi.local-redir"))) {
|
||||
PATCH(local_redir);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("cgi.upgrade"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("cgi.upgrade"))) {
|
||||
PATCH(upgrade);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("cgi.x-sendfile"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("cgi.x-sendfile"))) {
|
||||
PATCH(xsendfile_allow);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("cgi.x-sendfile-docroot"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("cgi.x-sendfile-docroot"))) {
|
||||
PATCH(xsendfile_docroot);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -179,15 +179,15 @@ static int mod_cml_patch_connection(server *srv, connection *con, plugin_data *p
|
|||
for (j = 0; j < dc->value->used; j++) {
|
||||
data_unset *du = dc->value->data[j];
|
||||
|
||||
if (buffer_is_equal_string(du->key, CONST_STR_LEN("cml.extension"))) {
|
||||
if (buffer_is_equal_string(&du->key, CONST_STR_LEN("cml.extension"))) {
|
||||
PATCH(ext);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("cml.memcache-hosts"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("cml.memcache-hosts"))) {
|
||||
#if defined(USE_MEMCACHED)
|
||||
PATCH(memc);
|
||||
#endif
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("cml.memcache-namespace"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("cml.memcache-namespace"))) {
|
||||
PATCH(mc_namespace);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("cml.power-magnet"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("cml.power-magnet"))) {
|
||||
PATCH(power_magnet);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -765,15 +765,15 @@ static int mod_compress_patch_connection(server *srv, connection *con, plugin_da
|
|||
for (j = 0; j < dc->value->used; j++) {
|
||||
data_unset *du = dc->value->data[j];
|
||||
|
||||
if (buffer_is_equal_string(du->key, CONST_STR_LEN("compress.cache-dir"))) {
|
||||
if (buffer_is_equal_string(&du->key, CONST_STR_LEN("compress.cache-dir"))) {
|
||||
PATCH(compress_cache_dir);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("compress.filetype"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("compress.filetype"))) {
|
||||
PATCH(compress);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("compress.max-filesize"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("compress.max-filesize"))) {
|
||||
PATCH(compress_max_filesize);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("compress.allowed-encodings"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("compress.allowed-encodings"))) {
|
||||
PATCH(allowed_encodings);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("compress.max-loadavg"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("compress.max-loadavg"))) {
|
||||
PATCH(max_loadavg);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -965,21 +965,21 @@ static int mod_deflate_patch_connection(server *srv, connection *con, plugin_dat
|
|||
for (j = 0; j < dc->value->used; j++) {
|
||||
data_unset *du = dc->value->data[j];
|
||||
|
||||
if (buffer_is_equal_string(du->key, CONST_STR_LEN("deflate.mimetypes"))) {
|
||||
if (buffer_is_equal_string(&du->key, CONST_STR_LEN("deflate.mimetypes"))) {
|
||||
PATCH(mimetypes);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("deflate.allowed-encodings"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("deflate.allowed-encodings"))) {
|
||||
PATCH(allowed_encodings);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("deflate.max-compress-size"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("deflate.max-compress-size"))) {
|
||||
PATCH(max_compress_size);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("deflate.min-compress-size"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("deflate.min-compress-size"))) {
|
||||
PATCH(min_compress_size);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("deflate.compression-level"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("deflate.compression-level"))) {
|
||||
PATCH(compression_level);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("deflate.output-buffer-size"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("deflate.output-buffer-size"))) {
|
||||
PATCH(output_buffer_size);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("deflate.work-block-size"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("deflate.work-block-size"))) {
|
||||
PATCH(work_block_size);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("deflate.max-loadavg"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("deflate.max-loadavg"))) {
|
||||
PATCH(max_loadavg);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -368,34 +368,34 @@ static int mod_dirlisting_patch_connection(server *srv, connection *con, plugin_
|
|||
for (j = 0; j < dc->value->used; j++) {
|
||||
data_unset *du = dc->value->data[j];
|
||||
|
||||
if (buffer_is_equal_string(du->key, CONST_STR_LEN(CONFIG_ACTIVATE)) ||
|
||||
buffer_is_equal_string(du->key, CONST_STR_LEN(CONFIG_DIR_LISTING))) {
|
||||
if (buffer_is_equal_string(&du->key, CONST_STR_LEN(CONFIG_ACTIVATE)) ||
|
||||
buffer_is_equal_string(&du->key, CONST_STR_LEN(CONFIG_DIR_LISTING))) {
|
||||
PATCH(dir_listing);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN(CONFIG_HIDE_DOTFILES))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN(CONFIG_HIDE_DOTFILES))) {
|
||||
PATCH(hide_dot_files);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN(CONFIG_EXTERNAL_CSS))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN(CONFIG_EXTERNAL_CSS))) {
|
||||
PATCH(external_css);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN(CONFIG_EXTERNAL_JS))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN(CONFIG_EXTERNAL_JS))) {
|
||||
PATCH(external_js);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN(CONFIG_ENCODING))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN(CONFIG_ENCODING))) {
|
||||
PATCH(encoding);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN(CONFIG_SHOW_README))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN(CONFIG_SHOW_README))) {
|
||||
PATCH(show_readme);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN(CONFIG_HIDE_README_FILE))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN(CONFIG_HIDE_README_FILE))) {
|
||||
PATCH(hide_readme_file);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN(CONFIG_SHOW_HEADER))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN(CONFIG_SHOW_HEADER))) {
|
||||
PATCH(show_header);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN(CONFIG_HIDE_HEADER_FILE))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN(CONFIG_HIDE_HEADER_FILE))) {
|
||||
PATCH(hide_header_file);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN(CONFIG_SET_FOOTER))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN(CONFIG_SET_FOOTER))) {
|
||||
PATCH(set_footer);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN(CONFIG_EXCLUDE))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN(CONFIG_EXCLUDE))) {
|
||||
PATCH(excludes);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN(CONFIG_ENCODE_README))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN(CONFIG_ENCODE_README))) {
|
||||
PATCH(encode_readme);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN(CONFIG_ENCODE_HEADER))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN(CONFIG_ENCODE_HEADER))) {
|
||||
PATCH(encode_header);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN(CONFIG_AUTO_LAYOUT))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN(CONFIG_AUTO_LAYOUT))) {
|
||||
PATCH(auto_layout);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -132,11 +132,11 @@ static int mod_evasive_patch_connection(server *srv, connection *con, plugin_dat
|
|||
for (j = 0; j < dc->value->used; j++) {
|
||||
data_unset *du = dc->value->data[j];
|
||||
|
||||
if (buffer_is_equal_string(du->key, CONST_STR_LEN("evasive.max-conns-per-ip"))) {
|
||||
if (buffer_is_equal_string(&du->key, CONST_STR_LEN("evasive.max-conns-per-ip"))) {
|
||||
PATCH(max_conns);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("evasive.silent"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("evasive.silent"))) {
|
||||
PATCH(silent);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("evasive.location"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("evasive.location"))) {
|
||||
PATCH(location);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -273,7 +273,7 @@ static int mod_evhost_patch_connection(server *srv, connection *con, plugin_data
|
|||
for (j = 0; j < dc->value->used; j++) {
|
||||
data_unset *du = dc->value->data[j];
|
||||
|
||||
if (buffer_is_equal_string(du->key, CONST_STR_LEN("evhost.path-pattern"))) {
|
||||
if (buffer_is_equal_string(&du->key, CONST_STR_LEN("evhost.path-pattern"))) {
|
||||
PATCH(path_pieces);
|
||||
PATCH(len);
|
||||
}
|
||||
|
|
|
@ -312,9 +312,9 @@ static int mod_expire_patch_connection(server *srv, connection *con, plugin_data
|
|||
for (j = 0; j < dc->value->used; j++) {
|
||||
data_unset *du = dc->value->data[j];
|
||||
|
||||
if (buffer_is_equal_string(du->key, CONST_STR_LEN("expire.url"))) {
|
||||
if (buffer_is_equal_string(&du->key, CONST_STR_LEN("expire.url"))) {
|
||||
PATCH(expire_url);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("expire.mimetypes"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("expire.mimetypes"))) {
|
||||
PATCH(expire_mimetypes);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -397,17 +397,17 @@ static int mod_extforward_patch_connection(server *srv, connection *con, plugin_
|
|||
for (j = 0; j < dc->value->used; j++) {
|
||||
data_unset *du = dc->value->data[j];
|
||||
|
||||
if (buffer_is_equal_string(du->key, CONST_STR_LEN("extforward.forwarder"))) {
|
||||
if (buffer_is_equal_string(&du->key, CONST_STR_LEN("extforward.forwarder"))) {
|
||||
PATCH(forwarder);
|
||||
PATCH(forward_masks);
|
||||
PATCH(forward_all);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("extforward.headers"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("extforward.headers"))) {
|
||||
PATCH(headers);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("extforward.params"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("extforward.params"))) {
|
||||
PATCH(opts);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("extforward.hap-PROXY"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("extforward.hap-PROXY"))) {
|
||||
PATCH(hap_PROXY);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("extforward.hap-PROXY-ssl-client-verify"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("extforward.hap-PROXY-ssl-client-verify"))) {
|
||||
PATCH(hap_PROXY_ssl_client_verify);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -462,15 +462,15 @@ static int fcgi_patch_connection(server *srv, connection *con, plugin_data *p) {
|
|||
for (j = 0; j < dc->value->used; j++) {
|
||||
data_unset *du = dc->value->data[j];
|
||||
|
||||
if (buffer_is_equal_string(du->key, CONST_STR_LEN("fastcgi.server"))) {
|
||||
if (buffer_is_equal_string(&du->key, CONST_STR_LEN("fastcgi.server"))) {
|
||||
PATCH(exts);
|
||||
PATCH(exts_auth);
|
||||
PATCH(exts_resp);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("fastcgi.debug"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("fastcgi.debug"))) {
|
||||
PATCH(debug);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("fastcgi.balance"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("fastcgi.balance"))) {
|
||||
PATCH(balance);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("fastcgi.map-extensions"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("fastcgi.map-extensions"))) {
|
||||
PATCH(ext_mapping);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -107,7 +107,7 @@ static int mod_flv_streaming_patch_connection(server *srv, connection *con, plug
|
|||
for (j = 0; j < dc->value->used; j++) {
|
||||
data_unset *du = dc->value->data[j];
|
||||
|
||||
if (buffer_is_equal_string(du->key, CONST_STR_LEN("flv-streaming.extensions"))) {
|
||||
if (buffer_is_equal_string(&du->key, CONST_STR_LEN("flv-streaming.extensions"))) {
|
||||
PATCH(extensions);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -198,11 +198,11 @@ static int mod_geoip_patch_connection(server *srv, connection *con, plugin_data
|
|||
for (j = 0; j < dc->value->used; j++) {
|
||||
data_unset *du = dc->value->data[j];
|
||||
|
||||
if (buffer_is_equal_string(du->key, CONST_STR_LEN("geoip.db-filename"))) {
|
||||
if (buffer_is_equal_string(&du->key, CONST_STR_LEN("geoip.db-filename"))) {
|
||||
PATCH(db_name);
|
||||
}
|
||||
|
||||
if (buffer_is_equal_string(du->key, CONST_STR_LEN("geoip.memory-cache"))) {
|
||||
if (buffer_is_equal_string(&du->key, CONST_STR_LEN("geoip.memory-cache"))) {
|
||||
PATCH(mem_cache);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -131,9 +131,9 @@ static int mod_indexfile_patch_connection(server *srv, connection *con, plugin_d
|
|||
for (j = 0; j < dc->value->used; j++) {
|
||||
data_unset *du = dc->value->data[j];
|
||||
|
||||
if (buffer_is_equal_string(du->key, CONST_STR_LEN("server.indexfiles"))) {
|
||||
if (buffer_is_equal_string(&du->key, CONST_STR_LEN("server.indexfiles"))) {
|
||||
PATCH(indexfiles);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("index-file.names"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("index-file.names"))) {
|
||||
PATCH(indexfiles);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -159,9 +159,9 @@ static int mod_magnet_patch_connection(server *srv, connection *con, plugin_data
|
|||
for (j = 0; j < dc->value->used; j++) {
|
||||
data_unset *du = dc->value->data[j];
|
||||
|
||||
if (buffer_is_equal_string(du->key, CONST_STR_LEN(MAGNET_CONFIG_RAW_URL))) {
|
||||
if (buffer_is_equal_string(&du->key, CONST_STR_LEN(MAGNET_CONFIG_RAW_URL))) {
|
||||
PATCH(url_raw);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN(MAGNET_CONFIG_PHYSICAL_PATH))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN(MAGNET_CONFIG_PHYSICAL_PATH))) {
|
||||
PATCH(physical_path);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -344,14 +344,14 @@ mod_maxmind_patch_connection (server * const srv,
|
|||
for (size_t j = 0; j < dc->value->used; ++j) {
|
||||
data_unset *du = dc->value->data[j];
|
||||
|
||||
if (buffer_is_equal_string(du->key, CONST_STR_LEN("maxminddb.activate"))) {
|
||||
if (buffer_is_equal_string(&du->key, CONST_STR_LEN("maxminddb.activate"))) {
|
||||
PATCH(activate);
|
||||
}
|
||||
else if (buffer_is_equal_string(du->key, CONST_STR_LEN("maxminddb.db"))) {
|
||||
else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("maxminddb.db"))) {
|
||||
/*PATCH(db_name);*//*(not used)*/
|
||||
PATCH(mmdb);
|
||||
}
|
||||
else if (buffer_is_equal_string(du->key, CONST_STR_LEN("maxminddb.env"))) {
|
||||
else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("maxminddb.env"))) {
|
||||
PATCH(env);
|
||||
PATCH(cenv);
|
||||
}
|
||||
|
|
|
@ -250,7 +250,7 @@ static int mod_mysql_vhost_patch_connection(server *srv, connection *con, plugin
|
|||
for (j = 0; j < dc->value->used; j++) {
|
||||
data_unset *du = dc->value->data[j];
|
||||
|
||||
if (buffer_is_equal_string(du->key, CONST_STR_LEN("mysql-vhost.sql"))) {
|
||||
if (buffer_is_equal_string(&du->key, CONST_STR_LEN("mysql-vhost.sql"))) {
|
||||
PATCH(mysql_query);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1398,55 +1398,55 @@ mod_openssl_patch_connection (server *srv, connection *con, handler_ctx *hctx)
|
|||
for (size_t j = 0; j < dc->value->used; ++j) {
|
||||
data_unset *du = dc->value->data[j];
|
||||
|
||||
if (buffer_is_equal_string(du->key, CONST_STR_LEN("ssl.pemfile"))) {
|
||||
if (buffer_is_equal_string(&du->key, CONST_STR_LEN("ssl.pemfile"))) {
|
||||
/*PATCH(ssl_pemfile);*//*(not patched)*/
|
||||
/*PATCH(ssl_privkey);*//*(not patched)*/
|
||||
PATCH(ssl_pemfile_x509);
|
||||
PATCH(ssl_pemfile_pkey);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("ssl.ca-file"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("ssl.ca-file"))) {
|
||||
PATCH(ssl_ca_file);
|
||||
PATCH(ssl_ca_file_cert_names);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("ssl.ca-dn-file"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("ssl.ca-dn-file"))) {
|
||||
PATCH(ssl_ca_dn_file);
|
||||
PATCH(ssl_ca_file_cert_names);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("ssl.verifyclient.activate"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("ssl.verifyclient.activate"))) {
|
||||
PATCH(ssl_verifyclient);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("ssl.verifyclient.enforce"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("ssl.verifyclient.enforce"))) {
|
||||
PATCH(ssl_verifyclient_enforce);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("ssl.verifyclient.depth"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("ssl.verifyclient.depth"))) {
|
||||
PATCH(ssl_verifyclient_depth);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("ssl.verifyclient.username"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("ssl.verifyclient.username"))) {
|
||||
PATCH(ssl_verifyclient_username);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("ssl.verifyclient.exportcert"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("ssl.verifyclient.exportcert"))) {
|
||||
PATCH(ssl_verifyclient_export_cert);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("ssl.disable-client-renegotiation"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("ssl.disable-client-renegotiation"))) {
|
||||
PATCH(ssl_disable_client_renegotiation);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("ssl.read-ahead"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("ssl.read-ahead"))) {
|
||||
PATCH(ssl_read_ahead);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("ssl.acme-tls-1"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("ssl.acme-tls-1"))) {
|
||||
PATCH(ssl_acme_tls_1);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("debug.log-ssl-noise"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("debug.log-ssl-noise"))) {
|
||||
PATCH(ssl_log_noise);
|
||||
#if 0 /*(not patched)*/
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("ssl.ca-crl-file"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("ssl.ca-crl-file"))) {
|
||||
PATCH(ssl_ca_crl_file);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("ssl.honor-cipher-order"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("ssl.honor-cipher-order"))) {
|
||||
PATCH(ssl_honor_cipher_order);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("ssl.empty-fragments"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("ssl.empty-fragments"))) {
|
||||
PATCH(ssl_empty_fragments);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("ssl.use-sslv2"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("ssl.use-sslv2"))) {
|
||||
PATCH(ssl_use_sslv2);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("ssl.use-sslv3"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("ssl.use-sslv3"))) {
|
||||
PATCH(ssl_use_sslv3);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("ssl.cipher-list"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("ssl.cipher-list"))) {
|
||||
PATCH(ssl_cipher_list);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("ssl.dh-file"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("ssl.dh-file"))) {
|
||||
PATCH(ssl_dh_file);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("ssl.ec-curve"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("ssl.ec-curve"))) {
|
||||
PATCH(ssl_ec_curve);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("ssl.engine"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("ssl.engine"))) {
|
||||
PATCH(ssl_enabled);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("ssl.openssl.ssl-conf-cmd"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("ssl.openssl.ssl-conf-cmd"))) {
|
||||
PATCH(ssl_conf_cmd);
|
||||
#endif
|
||||
}
|
||||
|
|
|
@ -900,21 +900,21 @@ static int mod_proxy_patch_connection(server *srv, connection *con, plugin_data
|
|||
for (j = 0; j < dc->value->used; j++) {
|
||||
data_unset *du = dc->value->data[j];
|
||||
|
||||
if (buffer_is_equal_string(du->key, CONST_STR_LEN("proxy.server"))) {
|
||||
if (buffer_is_equal_string(&du->key, CONST_STR_LEN("proxy.server"))) {
|
||||
PATCH_GW(exts);
|
||||
PATCH_GW(exts_auth);
|
||||
PATCH_GW(exts_resp);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("proxy.debug"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("proxy.debug"))) {
|
||||
PATCH_GW(debug);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("proxy.balance"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("proxy.balance"))) {
|
||||
PATCH_GW(balance);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("proxy.map-extensions"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("proxy.map-extensions"))) {
|
||||
PATCH_GW(ext_mapping);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("proxy.replace-http-host"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("proxy.replace-http-host"))) {
|
||||
PATCH(replace_http_host);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("proxy.forwarded"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("proxy.forwarded"))) {
|
||||
PATCH(forwarded);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("proxy.header"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("proxy.header"))) {
|
||||
PATCH(header); /*(copies struct)*/
|
||||
}
|
||||
}
|
||||
|
|
|
@ -134,10 +134,10 @@ static int mod_redirect_patch_connection(server *srv, connection *con, plugin_da
|
|||
for (j = 0; j < dc->value->used; j++) {
|
||||
data_unset *du = dc->value->data[j];
|
||||
|
||||
if (0 == strcmp(du->key->ptr, "url.redirect")) {
|
||||
if (0 == strcmp(du->key.ptr, "url.redirect")) {
|
||||
p->conf.redirect = s->redirect;
|
||||
p->conf.context = dc;
|
||||
} else if (0 == strcmp(du->key->ptr, "url.redirect-code")) {
|
||||
} else if (0 == strcmp(du->key.ptr, "url.redirect-code")) {
|
||||
p->conf.redirect_code = s->redirect_code;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -183,27 +183,27 @@ static int mod_rewrite_patch_connection(server *srv, connection *con, plugin_dat
|
|||
for (j = 0; j < dc->value->used; j++) {
|
||||
data_unset *du = dc->value->data[j];
|
||||
|
||||
if (buffer_is_equal_string(du->key, CONST_STR_LEN("url.rewrite"))) {
|
||||
if (buffer_is_equal_string(&du->key, CONST_STR_LEN("url.rewrite"))) {
|
||||
PATCH(rewrite);
|
||||
p->conf.context = dc;
|
||||
PATCH(rewrite_repeat_idx);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("url.rewrite-once"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("url.rewrite-once"))) {
|
||||
PATCH(rewrite);
|
||||
p->conf.context = dc;
|
||||
PATCH(rewrite_repeat_idx);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("url.rewrite-repeat"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("url.rewrite-repeat"))) {
|
||||
PATCH(rewrite);
|
||||
p->conf.context = dc;
|
||||
PATCH(rewrite_repeat_idx);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("url.rewrite-if-not-file"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("url.rewrite-if-not-file"))) {
|
||||
PATCH(rewrite_NF);
|
||||
p->conf.context_NF = dc;
|
||||
PATCH(rewrite_NF_repeat_idx);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("url.rewrite-repeat-if-not-file"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("url.rewrite-repeat-if-not-file"))) {
|
||||
PATCH(rewrite_NF);
|
||||
p->conf.context_NF = dc;
|
||||
PATCH(rewrite_NF_repeat_idx);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("url.rewrite-final"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("url.rewrite-final"))) {
|
||||
PATCH(rewrite);
|
||||
p->conf.context = dc;
|
||||
PATCH(rewrite_repeat_idx);
|
||||
|
|
|
@ -265,7 +265,7 @@ static int mod_rrd_patch_connection(server *srv, connection *con, plugin_data *p
|
|||
for (j = 0; j < dc->value->used; j++) {
|
||||
data_unset *du = dc->value->data[j];
|
||||
|
||||
if (buffer_is_equal_string(du->key, CONST_STR_LEN("rrdtool.db-name"))) {
|
||||
if (buffer_is_equal_string(&du->key, CONST_STR_LEN("rrdtool.db-name"))) {
|
||||
PATCH(path_rrd);
|
||||
/* get pointers to double values */
|
||||
|
||||
|
|
|
@ -251,17 +251,17 @@ static int scgi_patch_connection(server *srv, connection *con, plugin_data *p) {
|
|||
for (j = 0; j < dc->value->used; j++) {
|
||||
data_unset *du = dc->value->data[j];
|
||||
|
||||
if (buffer_is_equal_string(du->key, CONST_STR_LEN("scgi.server"))) {
|
||||
if (buffer_is_equal_string(&du->key, CONST_STR_LEN("scgi.server"))) {
|
||||
PATCH(exts);
|
||||
PATCH(exts_auth);
|
||||
PATCH(exts_resp);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("scgi.protocol"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("scgi.protocol"))) {
|
||||
PATCH(proto);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("scgi.balance"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("scgi.balance"))) {
|
||||
PATCH(balance);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("scgi.debug"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("scgi.debug"))) {
|
||||
PATCH(debug);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("scgi.map-extensions"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("scgi.map-extensions"))) {
|
||||
PATCH(ext_mapping);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -417,19 +417,19 @@ static int mod_secdownload_patch_connection(server *srv, connection *con, plugin
|
|||
for (j = 0; j < dc->value->used; j++) {
|
||||
data_unset *du = dc->value->data[j];
|
||||
|
||||
if (buffer_is_equal_string(du->key, CONST_STR_LEN("secdownload.secret"))) {
|
||||
if (buffer_is_equal_string(&du->key, CONST_STR_LEN("secdownload.secret"))) {
|
||||
PATCH(secret);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("secdownload.document-root"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("secdownload.document-root"))) {
|
||||
PATCH(doc_root);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("secdownload.uri-prefix"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("secdownload.uri-prefix"))) {
|
||||
PATCH(uri_prefix);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("secdownload.timeout"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("secdownload.timeout"))) {
|
||||
PATCH(timeout);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("secdownload.algorithm"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("secdownload.algorithm"))) {
|
||||
PATCH(algorithm);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("secdownload.path-segments"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("secdownload.path-segments"))) {
|
||||
PATCH(path_segments);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("secdownload.hash-querystr"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("secdownload.hash-querystr"))) {
|
||||
PATCH(hash_querystr);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -176,17 +176,17 @@ static int mod_setenv_patch_connection(server *srv, connection *con, plugin_data
|
|||
for (j = 0; j < dc->value->used; j++) {
|
||||
data_unset *du = dc->value->data[j];
|
||||
|
||||
if (buffer_is_equal_string(du->key, CONST_STR_LEN("setenv.add-request-header"))) {
|
||||
if (buffer_is_equal_string(&du->key, CONST_STR_LEN("setenv.add-request-header"))) {
|
||||
PATCH(request_header);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("setenv.set-request-header"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("setenv.set-request-header"))) {
|
||||
PATCH(set_request_header);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("setenv.add-response-header"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("setenv.add-response-header"))) {
|
||||
PATCH(response_header);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("setenv.set-response-header"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("setenv.set-response-header"))) {
|
||||
PATCH(set_response_header);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("setenv.add-environment"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("setenv.add-environment"))) {
|
||||
PATCH(environment);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("setenv.set-environment"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("setenv.set-environment"))) {
|
||||
PATCH(set_environment);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -200,16 +200,16 @@ static int mod_simple_vhost_patch_connection(server *srv, connection *con, plugi
|
|||
for (j = 0; j < dc->value->used; j++) {
|
||||
data_unset *du = dc->value->data[j];
|
||||
|
||||
if (buffer_is_equal_string(du->key, CONST_STR_LEN("simple-vhost.server-root"))) {
|
||||
if (buffer_is_equal_string(&du->key, CONST_STR_LEN("simple-vhost.server-root"))) {
|
||||
PATCH(server_root);
|
||||
PATCH(docroot_cache_key);
|
||||
PATCH(docroot_cache_value);
|
||||
PATCH(docroot_cache_servername);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("simple-vhost.default-host"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("simple-vhost.default-host"))) {
|
||||
PATCH(default_host);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("simple-vhost.document-root"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("simple-vhost.document-root"))) {
|
||||
PATCH(document_root);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("simple-vhost.debug"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("simple-vhost.debug"))) {
|
||||
PATCH(debug);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -135,7 +135,7 @@ static int mod_skeleton_patch_connection(server *srv, connection *con, plugin_da
|
|||
for (size_t j = 0; j < dc->value->used; ++j) {
|
||||
data_unset *du = dc->value->data[j];
|
||||
|
||||
if (buffer_is_equal_string(du->key, CONST_STR_LEN("skeleton.array"))) {
|
||||
if (buffer_is_equal_string(&du->key, CONST_STR_LEN("skeleton.array"))) {
|
||||
PATCH(match);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -117,13 +117,13 @@ static int mod_sockproxy_patch_connection(server *srv, connection *con, plugin_d
|
|||
for (j = 0; j < dc->value->used; j++) {
|
||||
data_unset *du = dc->value->data[j];
|
||||
|
||||
if (buffer_is_equal_string(du->key, CONST_STR_LEN("sockproxy.server"))) {
|
||||
if (buffer_is_equal_string(&du->key, CONST_STR_LEN("sockproxy.server"))) {
|
||||
PATCH(exts);
|
||||
PATCH(exts_auth);
|
||||
PATCH(exts_resp);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("sockproxy.debug"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("sockproxy.debug"))) {
|
||||
PATCH(debug);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("sockproxy.balance"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("sockproxy.balance"))) {
|
||||
PATCH(balance);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1282,15 +1282,15 @@ static int mod_ssi_patch_connection(server *srv, connection *con, plugin_data *p
|
|||
for (j = 0; j < dc->value->used; j++) {
|
||||
data_unset *du = dc->value->data[j];
|
||||
|
||||
if (buffer_is_equal_string(du->key, CONST_STR_LEN("ssi.extension"))) {
|
||||
if (buffer_is_equal_string(&du->key, CONST_STR_LEN("ssi.extension"))) {
|
||||
PATCH(ssi_extension);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("ssi.content-type"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("ssi.content-type"))) {
|
||||
PATCH(content_type);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("ssi.conditional-requests"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("ssi.conditional-requests"))) {
|
||||
PATCH(conditional_requests);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("ssi.exec"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("ssi.exec"))) {
|
||||
PATCH(ssi_exec);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("ssi.recursion-max"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("ssi.recursion-max"))) {
|
||||
PATCH(ssi_recursion_max);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -140,11 +140,11 @@ static int mod_staticfile_patch_connection(server *srv, connection *con, plugin_
|
|||
for (j = 0; j < dc->value->used; j++) {
|
||||
data_unset *du = dc->value->data[j];
|
||||
|
||||
if (buffer_is_equal_string(du->key, CONST_STR_LEN("static-file.exclude-extensions"))) {
|
||||
if (buffer_is_equal_string(&du->key, CONST_STR_LEN("static-file.exclude-extensions"))) {
|
||||
PATCH(exclude_ext);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("static-file.etags"))) {
|
||||
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("static-file.etags"))) {
|
||||
PATCH(etags_used);
|
||||
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("static-file.disable-pathinfo"))) { |