apache-mod_fastcgi-apr1.patch

   1 diff -urN mod_fastcgi-2.4.2.org/fcgi_protocol.c mod_fastcgi-2.4.2/fcgi_protocol.c
   2 --- mod_fastcgi-2.4.2.org/fcgi_protocol.c       2004-10-06 20:30:46.338893902 +0200
   3 +++ mod_fastcgi-2.4.2/fcgi_protocol.c   2004-10-06 20:42:23.772485111 +0200
   4 @@ -178,7 +178,7 @@
   5          int i = ph->nelts;
   6
   7          for ( ; i; --i, ++elt) {
   8 -            const char *val = ap_table_get(fr->r->headers_in, *elt);
   9 +            const char *val = apr_table_get(fr->r->headers_in, *elt);
  10              if (val) {
  11                  ap_table_setn(fr->r->subprocess_env, *elt, val);
  12              }
  13 diff -urN mod_fastcgi-2.4.2.org/mod_fastcgi.c mod_fastcgi-2.4.2/mod_fastcgi.c
  14 --- mod_fastcgi-2.4.2.org/mod_fastcgi.c 2004-10-06 20:30:46.355890260 +0200
  15 +++ mod_fastcgi-2.4.2/mod_fastcgi.c     2004-10-06 20:40:47.534101928 +0200
  16 @@ -267,7 +267,7 @@
  17
  18      /* Register to reset to default values when the config pool is cleaned */
  19      ap_block_alarms();
  20 -    ap_register_cleanup(p, NULL, fcgi_config_reset_globals, ap_null_cleanup);
  21 +    ap_register_cleanup(p, NULL, fcgi_config_reset_globals, apr_pool_cleanup_null);
  22      ap_unblock_alarms();
  23
  24  #ifdef APACHE2
  25 @@ -765,7 +765,7 @@
  26       * Who responds, this handler or Apache?
  27       */
  28      if (hasLocation) {
  29 -        const char *location = ap_table_get(r->headers_out, "Location");
  30 +        const char *location = apr_table_get(r->headers_out, "Location");
  31          /*
  32           * Based on internal redirect handling in mod_cgi.c...
  33           *
  34 @@ -2318,7 +2318,7 @@
  35      }
  36
  37      ap_block_alarms();
  38 -    ap_register_cleanup(rp, (void *)fr, cleanup, ap_null_cleanup);
  39 +    ap_register_cleanup(rp, (void *)fr, cleanup, apr_pool_cleanup_null);
  40      ap_unblock_alarms();
  41
  42  #ifdef WIN32
  43 @@ -2531,7 +2531,7 @@
  44   */
  45  static int apache_is_scriptaliased(request_rec *r)
  46  {
  47 -    const char *t = ap_table_get(r->notes, "alias-forced-type");
  48 +    const char *t = apr_table_get(r->notes, "alias-forced-type");
  49      return t && (!strcasecmp(t, "cgi-script"));
  50  }
  51
  52 @@ -2556,7 +2556,7 @@
  53              r->method_number = M_GET;
  54              ap_table_unset(r->headers_in, "Content-length");
  55
  56 -            ap_internal_redirect_handler(ap_table_get(r->headers_out, "Location"), r);
  57 +            ap_internal_redirect_handler(apr_table_get(r->headers_out, "Location"), r);
  58              return OK;
  59
  60          case SCAN_CGI_SRV_REDIRECT:
  61 @@ -2639,16 +2639,16 @@
  62
  63      if (passed) {
  64          if (fr->auth_compat) {
  65 -            ap_table_do((int (*)(void *, const char *, const char *))post_process_auth_passed_compat_header,
  66 +            apr_table_do((int (*)(void *, const char *, const char *))post_process_auth_passed_compat_header,
  67                   (void *)r->subprocess_env, fr->authHeaders, NULL);
  68          }
  69          else {
  70 -            ap_table_do((int (*)(void *, const char *, const char *))post_process_auth_passed_header,
  71 +            apr_table_do((int (*)(void *, const char *, const char *))post_process_auth_passed_header,
  72                   (void *)r->subprocess_env, fr->authHeaders, NULL);
  73          }
  74      }
  75      else {
  76 -        ap_table_do((int (*)(void *, const char *, const char *))post_process_auth_failed_header,
  77 +        apr_table_do((int (*)(void *, const char *, const char *))post_process_auth_failed_header,
  78               (void *)r->err_headers_out, fr->authHeaders, NULL);
  79      }
  80
  81 @@ -2697,7 +2697,7 @@
  82      post_process_auth(fr, authenticated);
  83
  84      /* A redirect shouldn't be allowed during the authentication phase */
  85 -    if (ap_table_get(r->headers_out, "Location") != NULL) {
  86 +    if (apr_table_get(r->headers_out, "Location") != NULL) {
  87          ap_log_rerror(FCGI_LOG_ERR_NOERRNO, r,
  88              "FastCGI: FastCgiAuthenticator \"%s\" redirected (not allowed)",
  89              dir_config->authenticator);
  90 @@ -2762,7 +2762,7 @@
  91      post_process_auth(fr, authorized);
  92
  93      /* A redirect shouldn't be allowed during the authorization phase */
  94 -    if (ap_table_get(r->headers_out, "Location") != NULL) {
  95 +    if (apr_table_get(r->headers_out, "Location") != NULL) {
  96          ap_log_rerror(FCGI_LOG_ERR_NOERRNO, r,
  97              "FastCGI: FastCgiAuthorizer \"%s\" redirected (not allowed)",
  98              dir_config->authorizer);
  99 @@ -2823,7 +2823,7 @@
 100      post_process_auth(fr, access_allowed);
 101
 102      /* A redirect shouldn't be allowed during the access check phase */
 103 -    if (ap_table_get(r->headers_out, "Location") != NULL) {
 104 +    if (apr_table_get(r->headers_out, "Location") != NULL) {
 105          ap_log_rerror(FCGI_LOG_ERR_NOERRNO, r,
 106              "FastCGI: FastCgiAccessChecker \"%s\" redirected (not allowed)",
 107              dir_config->access_checker);