← Back to branch summary

~ubuntu-branches/ubuntu/precise/apache2/precise

« back to all changes in this revision

Viewing changes to modules/proxy/mod_proxy.c

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2011-02-22 13:02:08 UTC
  • mfrom: (14.3.23 sid)
  • Revision ID: james.westby@ubuntu.com-20110222130208-5hrxnun6a8uygfhv
Tags: 2.2.17-1ubuntu1
* Merge from debian unstable, remaining changes:
  - debian/{control, rules}: Enable PIE hardening.
  - debian/{control, rules, apache2.2-common.ufw.profile}: Add ufw profiles.
  - debian/control: Add bzr tag and point it to our tree
  - debain/apache2.py, debian/apache2.2-common.isntall: Add apport hook.
  - debian/control, debian/ask-for-passphrase, debian/config-dir/mods-available/ssl.conf:
    Plymouth aware passphrase dialog program ask-for-passphrase. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/proxy/mod_proxy.c
365
365
        else
366
366
            return "scolonpathdelim must be On|Off";
367
367
    }
 
368
    else if (!strcasecmp(key, "failonstatus")) {
 
369
        char *val_split;
 
370
        char *status;
 
371
        char *tok_state;
 
372
 
 
373
        val_split = apr_pstrdup(p, val);
 
374
 
 
375
        balancer->errstatuses = apr_array_make(p, 1, sizeof(int));
 
376
 
 
377
        status = apr_strtok(val_split, ", ", &tok_state);
 
378
        while (status != NULL) {
 
379
            ival = atoi(status);
 
380
            if (ap_is_HTTP_VALID_RESPONSE(ival)) {
 
381
                *(int *)apr_array_push(balancer->errstatuses) = ival;
 
382
            }
 
383
            else {
 
384
                return "failonstatus must be one or more HTTP response codes";
 
385
            }
 
386
            status = apr_strtok(NULL, ", ", &tok_state);
 
387
        }
 
388
 
 
389
    }
368
390
    else {
369
391
        return "unknown Balancer parameter";
370
392
    }