summaryrefslogtreecommitdiff
path: root/sapi/apache2handler/apache_config.c
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2015-01-03 01:22:58 -0800
committerStanislav Malyshev <stas@php.net>2015-01-10 15:07:38 -0800
commitb7a7b1a624c97945c0aaa49d46ae996fc0bdb6bc (patch)
tree0e09490075ee4f9a75a77ef4168d8ee254c52e5b /sapi/apache2handler/apache_config.c
parent773c8b0c092a0e9ad5c5548815bcb9991d54d5c1 (diff)
downloadphp-git-b7a7b1a624c97945c0aaa49d46ae996fc0bdb6bc.tar.gz
trailing whitespace removal
Diffstat (limited to 'sapi/apache2handler/apache_config.c')
-rw-r--r--sapi/apache2handler/apache_config.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sapi/apache2handler/apache_config.c b/sapi/apache2handler/apache_config.c
index 92a683b22c..e1644d647d 100644
--- a/sapi/apache2handler/apache_config.c
+++ b/sapi/apache2handler/apache_config.c
@@ -60,11 +60,11 @@ static const char *real_value_hnd(cmd_parms *cmd, void *dummy, const char *name,
php_dir_entry e;
phpapdebug((stderr, "Getting %s=%s for %p (%d)\n", name, value, dummy, zend_hash_num_elements(&d->config)));
-
+
if (!strncasecmp(value, "none", sizeof("none"))) {
value = "";
}
-
+
e.value = apr_pstrdup(cmd->pool, value);
e.value_len = strlen(value);
e.status = status;
@@ -157,7 +157,7 @@ void *merge_php_config(apr_pool_t *p, void *base_conf, void *new_conf)
//??? zend_hash_merge_ex(&n->config, &e->config, NULL, sizeof(php_dir_entry), (merge_checker_func_t) should_overwrite_per_dir_entry, NULL);
#if STAS_0
for (zend_hash_internal_pointer_reset(&d->config);
- zend_hash_get_current_key(&d->config, &str, &str_len,
+ zend_hash_get_current_key(&d->config, &str, &str_len,
&num_index) == HASH_KEY_IS_STRING;
zend_hash_move_forward(&d->config)) {
pe = NULL;
@@ -176,7 +176,7 @@ char *get_php_config(void *conf, char *name, size_t name_len)
{
php_conf_rec *d = conf;
php_dir_entry *pe;
-
+
if ((pe = zend_hash_str_find_ptr(&d->config, name, name_len)) != NULL) {
return pe->value;
}
@@ -189,7 +189,7 @@ void apply_config(void *dummy)
php_conf_rec *d = dummy;
zend_string *str;
php_dir_entry *data;
-
+
ZEND_HASH_FOREACH_STR_KEY_PTR(&d->config, str, data) {
phpapdebug((stderr, "APPLYING (%s)(%s)\n", str, data->value));
if (zend_alter_ini_entry_chars(str, data->value, data->value_len, data->status, data->htaccess?PHP_INI_STAGE_HTACCESS:PHP_INI_STAGE_ACTIVATE) == FAILURE) {
@@ -212,7 +212,7 @@ static apr_status_t destroy_php_config(void *data)
{
php_conf_rec *d = data;
- phpapdebug((stderr, "Destroying config %p\n", data));
+ phpapdebug((stderr, "Destroying config %p\n", data));
zend_hash_destroy(&d->config);
return APR_SUCCESS;