aaron       02/01/03 07:45:57

  Modified:    flood    flood_net_ssl.c
  Log:
  This API has changed in APR, this brings us up to date. This whole thing
  will be ripped out by me and replaced with the new lock API, but this
  will keep us compiling.
  
  Revision  Changes    Path
  1.17      +13 -7     httpd-test/flood/flood_net_ssl.c
  
  Index: flood_net_ssl.c
  ===================================================================
  RCS file: /home/cvs/httpd-test/flood/flood_net_ssl.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- flood_net_ssl.c	6 Dec 2001 18:03:32 -0000	1.16
  +++ flood_net_ssl.c	3 Jan 2002 15:45:57 -0000	1.17
  @@ -93,9 +93,13 @@
   
       l = apr_palloc(ssl_pool, sizeof(CRYPTO_dynlock_value));
   #ifdef USE_RW_LOCK_FOR_SSL 
  -    apr_lock_create(&l->lock, APR_READWRITE, APR_INTRAPROCESS, NULL, ssl_pool);
  +    /* Intraprocess locks don't /need/ a filename... */
  +    apr_lock_create(&l->lock, APR_READWRITE, APR_INTRAPROCESS,
  +                    APR_LOCK_DEFAULT, NULL, ssl_pool);
   #else
  -    apr_lock_create(&l->lock, APR_MUTEX, APR_INTRAPROCESS, NULL, ssl_pool);
  +    /* Intraprocess locks don't /need/ a filename... */
  +    apr_lock_create(&l->lock, APR_MUTEX, APR_INTRAPROCESS,
  +                    APR_LOCK_DEFAULT, NULL, ssl_pool);
   #endif
       return l;
   }
  @@ -197,7 +201,7 @@
       OpenSSL_add_ssl_algorithms();
       SSL_load_error_strings();
       ERR_load_crypto_strings();
  -#if !FLOOD_HAS_DEVRAND
  +#if ! FLOOD_HAS_DEVRAND
       load_rand();
   #endif
   
  @@ -207,11 +211,13 @@
       for (i = 0; i < numlocks; i++)
       {
   #ifdef USE_RW_LOCK_FOR_SSL 
  -        apr_lock_create(&ssl_locks[i], APR_READWRITE, APR_INTRAPROCESS, NULL, 
  -                        ssl_pool);
  +        /* Intraprocess locks don't /need/ a filename... */
  +        apr_lock_create(&ssl_locks[i], APR_READWRITE, APR_INTRAPROCESS,
  +                        APR_LOCK_DEFAULT, NULL, ssl_pool);
   #else
  -        apr_lock_create(&ssl_locks[i], APR_MUTEX, APR_INTRAPROCESS, NULL, 
  -                        ssl_pool);
  +        /* Intraprocess locks don't /need/ a filename... */
  +        apr_lock_create(&ssl_locks[i], APR_MUTEX, APR_INTRAPROCESS,
  +                        APR_LOCK_DEFAULT, NULL, ssl_pool);
   #endif
       }