apache-mod_suphp-apr.patch

   1 diff -urN suphp-0.5.2.org/src/apache2/mod_suphp.c suphp-0.5.2/src/apache2/mod_suphp.c
   2 --- suphp-0.5.2.org/src/apache2/mod_suphp.c     2004-10-23 12:58:09.156787800 +0200
   3 +++ suphp-0.5.2/src/apache2/mod_suphp.c 2004-10-23 12:59:23.461491768 +0200
   4 @@ -56,7 +56,7 @@
   5          return -1;
   6
   7      rv = apr_bucket_read(b, &bucket_data, &bucket_data_len, APR_BLOCK_READ);
   8 -    if (!APR_STATUS_IS_SUCCESS(rv) || (bucket_data_len == 0))
   9 +    if (rv != APR_SUCCESS || (bucket_data_len == 0))
  10      {
  11          return 0;
  12      }
  13 @@ -524,7 +524,7 @@
  14              return rv;
  15          }
  16
  17 -        APR_BRIGADE_FOREACH(bucket, bb)
  18 +       for(bucket = APR_BRIGADE_FIRST(bb); bucket != APR_BRIGADE_SENTINEL(bb); bucket = APR_BUCKET_NEXT(bucket))
  19          {
  20              const char *data;
  21              apr_size_t len;
  22 @@ -595,7 +595,7 @@
  23
  24              const char *buf;
  25              apr_size_t blen;
  26 -            APR_BRIGADE_FOREACH(b, bb)
  27 +           for(b = APR_BRIGADE_FIRST(bb); b != APR_BRIGADE_SENTINEL(bb); b = APR_BUCKET_NEXT(b))
  28              {
  29                  if (APR_BUCKET_IS_EOS(b))
  30                      break;
  31 @@ -616,7 +616,7 @@
  32              /* empty brigade (script output) */
  33              const char *buf;
  34              apr_size_t blen;
  35 -            APR_BRIGADE_FOREACH(b, bb)
  36 +           for(b = APR_BRIGADE_FIRST(bb); b != APR_BRIGADE_SENTINEL(bb); b = APR_BUCKET_NEXT(b))
  37              {
  38                  if (APR_BUCKET_IS_EOS(b))
  39                      break;
  40 diff -ur suphp-0.6.1/acinclude.m4 suphp-0.6.1.apr/acinclude.m4
  41 --- suphp-0.6.1/acinclude.m4    2005-11-26 20:45:49.000000000 +0100
  42 +++ suphp-0.6.1.apr/acinclude.m4        2006-01-27 18:53:40.000000000 +0100
  43 @@ -40,7 +40,7 @@
  44  dnl value of apr_config to fetch any necessary build/link information.
  45  dnl
  46
  47 -AC_DEFUN(APR_FIND_APR, [
  48 +AC_DEFUN([APR_FIND_APR], [
  49    apr_found="no"
  50
  51    if test "$ac_cv_emxos2" = "yes"; then
  52 @@ -53,18 +53,18 @@
  53    AC_MSG_CHECKING(for APR)
  54    AC_ARG_WITH(apr,
  55    [  --with-apr=DIR|FILE     prefix for installed APR, path to APR build tree,
  56 -                          or the full path to apr-config],
  57 +                          or the full path to apr-1-config],
  58    [
  59      if test "$withval" = "no" || test "$withval" = "yes"; then
  60        AC_MSG_ERROR([--with-apr requires a directory to be provided])
  61      fi
  62
  63 -    if $TEST_X "$withval/bin/apr-config"; then
  64 +    if $TEST_X "$withval/bin/apr-1-config"; then
  65        apr_found="yes"
  66 -      apr_config="$withval/bin/apr-config"
  67 -    elif $TEST_X "$withval/apr-config"; then
  68 +      apr_config="$withval/bin/apr-1-config"
  69 +    elif $TEST_X "$withval/apr-1-config"; then
  70        apr_found="yes"
  71 -      apr_config="$withval/apr-config"
  72 +      apr_config="$withval/apr-1-config"
  73      elif $TEST_X "$withval" && $withval --help > /dev/null 2>&1 ; then
  74        apr_found="yes"
  75        apr_config="$withval"
  76 @@ -73,7 +73,7 @@
  77      dnl if --with-apr is used, then the target prefix/directory must be valid
  78      if test "$apr_found" != "yes"; then
  79        AC_MSG_ERROR([the --with-apr parameter is incorrect. It must specify an install prefix, a
  80 -build directory, or an apr-config file.])
  81 +build directory, or an apr-1-config file.])
  82      fi
  83    ],[
  84      dnl if we have a bundled source directory, use it
  85 @@ -81,21 +81,21 @@
  86        apr_temp_abs_srcdir="`cd $1 && pwd`"
  87        apr_found="reconfig"
  88        if test -n "$2"; then
  89 -        apr_config="$2/apr-config"
  90 +        apr_config="$2/apr-1-config"
  91        else
  92 -        apr_config="$1/apr-config"
  93 +        apr_config="$1/apr-1-config"
  94        fi
  95      fi
  96      if test "$apr_found" = "no" && test -n "$3" && test "$3" = "1"; then
  97 -      if apr-config --help > /dev/null 2>&1 ; then
  98 +      if apr-1-config --help > /dev/null 2>&1 ; then
  99          apr_found="yes"
 100 -        apr_config="apr-config"
 101 +        apr_config="apr-1-config"
 102        else
 103          dnl look in some standard places (apparently not in builtin/default)
 104          for lookdir in /usr /usr/local /opt/apr /usr/local/apache2 ; do
 105 -          if $TEST_X "$lookdir/bin/apr-config"; then
 106 +          if $TEST_X "$lookdir/bin/apr-1-config"; then
 107              apr_found="yes"
 108 -            apr_config="$lookdir/bin/apr-config"
 109 +            apr_config="$lookdir/bin/apr-1-config"
 110              break
 111            fi
 112          done