Commit 86b5bf08 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  This patch eliminated from the _SHARED_ segment of the scoreboard all
  pointer math.  This is required for portable scoreboards.

  vhost becomes the 'vhost name string' so it now survives ap_generation
  clicks.  next was apparently never used.

  This patch also accounts for the changes to the apr_shm api, and gives
  Win32 the magic of a shared scoreboard.

  Breakage aplenty on non-win32 platforms, I suspect, but this radical
  surgery, and culling of unused functions, was really, really needed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@92791 13f79535-47bb-0310-9956-ffa450edef68
parent 958cfc97

ssl_engine_rand.c

+1 −1
Changes for ssl_engine_rand.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ int ssl_rand_seed(server_rec *s, apr_pool_t *p, ssl_rsctx_t nCtx, char *prefix) 
                 * seed in an 1KB extract of the current scoreboard

                 */

                if (ap_scoreboard_image != NULL) {

                    n = ssl_rand_choosenum(0, sizeof(scoreboard)-1024-1);

                    n = ssl_rand_choosenum(0,ap_calc_scoreboard_size()-1024-1);

                    RAND_seed(((unsigned char *)ap_scoreboard_image)+n, 1024);

                    nDone += 1024;

                }

ssl_expr_parse.c

+905 −429

File changed.

Preview size limit exceeded, changes collapsed.

ssl_expr_parse.h

+6 −8
Changes for ssl_expr_parse.h: 6 added lines, 8 removed lines.
Original line number Diff line number Diff line 
#ifndef YYERRCODE

#define YYERRCODE 256

#endif



typedef union {

    char     *cpVal;

    ssl_expr *exVal;

} YYSTYPE;

#define	T_TRUE	257

#define	T_FALSE	258

#define	T_DIGIT	259
@@ -22,8 +22,6 @@ 
#define	T_OP_OR	274

#define	T_OP_AND	275

#define	T_OP_NOT	276

typedef union {

    char     *cpVal;

    ssl_expr *exVal;

} YYSTYPE;





extern YYSTYPE ssl_expr_yylval;

ssl_expr_scan.c

+2 −0
Changes for ssl_expr_scan.c: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
/* A lexical scanner generated by flex */



/* Scanner skeleton version:

 * $Header: /home/striker/cvs2svn/dumps/httpd-2.0/../../httpd-2.0/modules/ssl/ssl_expr_scan.c,v 1.7 2002/01/10 00:28:00 wrowe Exp $

 */



#define FLEX_SCANNER
@@ -38,6 +39,7 @@ 
#ifdef __cplusplus



#include <stdlib.h>

#include <unistd.h>



/* Use prototypes in function declarations. */

#define YY_USE_PROTOS