dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-apache2.2.patch

   1 Author: Niko Tyni <ntyni@iki.fi>
   2 Description: Apache 2.2 compatibility fixes (#393017):
   3 * APR_BRIGADE_FOREACH macro removal
   4 * apr_filename_of_pathname() rename
   5 --- a/src/mod_speedycgi2.c
   6 +++ b/src/mod_speedycgi2.c
   7 @@ -340,7 +340,10 @@
   8      const char *buf;
   9      apr_size_t len;
  10      apr_status_t rv;
  11 -    APR_BRIGADE_FOREACH(e, bb) {
  12 +    for (e = APR_BRIGADE_FIRST(bb);
  13 +        e != APR_BRIGADE_SENTINEL(bb);
  14 +        e  = APR_BUCKET_NEXT(e)) {
  15 +
  16          if (APR_BUCKET_IS_EOS(e)) {
  17              break;
  18          }
  19 @@ -380,7 +383,7 @@
  20          return DECLINED;
  21      }
  22
  23 -    argv0 = apr_filename_of_pathname(r->filename);
  24 +    argv0 = apr_filepath_name_get(r->filename);
  25      nph = !(strncmp(argv0, "nph-", 4));
  26
  27      if (!(ap_allow_options(r) & OPT_EXECCGI) && !is_scriptaliased(r))
  28 @@ -436,7 +439,7 @@
  29      if ((rv = default_build_command(&command, &argv, r, p)) != APR_SUCCESS) {
  30          ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_TOCLIENT, rv, r,
  31                        "don't know how to spawn child process: %s",
  32 -                      apr_filename_of_pathname(r->filename));
  33 +                      apr_filepath_name_get(r->filename));
  34          return HTTP_INTERNAL_SERVER_ERROR;
  35      }
  36
  37 @@ -445,7 +448,7 @@
  38                              command, argv, r, p)) != APR_SUCCESS) {
  39          ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_TOCLIENT, rv, r,
  40                        "couldn't spawn child process: %s",
  41 -                     apr_filename_of_pathname(r->filename));
  42 +                     apr_filepath_name_get(r->filename));
  43          return HTTP_INTERNAL_SERVER_ERROR;
  44      }
  45
  46 @@ -465,7 +468,9 @@
  47              return rv;
  48          }
  49
  50 -        APR_BRIGADE_FOREACH(bucket, bb) {
  51 +        for (bucket = APR_BRIGADE_FIRST(bb);
  52 +            bucket != APR_BRIGADE_SENTINEL(bb);
  53 +            bucket  = APR_BUCKET_NEXT(bucket)) {
  54              const char *data;
  55              apr_size_t len;
  56