httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@hyperreal.org
Subject cvs commit: apachen/src/main http_main.c
Date Sat, 24 Jan 1998 16:27:57 GMT
coar        98/01/24 08:27:57

  Modified:    src      CHANGES
               src/main http_main.c
  Log:
  	Rename new_connection() in http_main.c to ap__new_connection()
  	in order to avoid name collisions with LDAP libraries.  The
  	function can't be made static without breaking mod_perl,
  	so I've created the "ap__" prefix for private non-static non-API
  	identifiers.  Somewhat arbitrary, but it sort of goes along
  	with "ap_" referring to Apache httpd-neutral names - the
  	double-underbar means that these *aren't* httpd-neutral.
  
  Revision  Changes    Path
  1.594     +5 -0      apachen/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/CHANGES,v
  retrieving revision 1.593
  retrieving revision 1.594
  diff -u -r1.593 -r1.594
  --- CHANGES	1998/01/24 04:15:02	1.593
  +++ CHANGES	1998/01/24 16:27:53	1.594
  @@ -1,5 +1,10 @@
   Changes with Apache 1.3b4
   
  +  *) Rename new_connection() to ap__new_connection() to avoid namespace
  +     collision with LDAP library routines.  The "ap__" prefix means
  +     it's a private non-API interface, as opposed to "ap_".
  +     [Ken Coar, Rasmus Lerdorf]
  +
     *) WIN32: mod_speling is now available on the Win32 platform.
        [Marc Slemko]
   
  
  
  
  1.274     +15 -15    apachen/src/main/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/main/http_main.c,v
  retrieving revision 1.273
  retrieving revision 1.274
  diff -u -r1.273 -r1.274
  --- http_main.c	1998/01/23 00:36:41	1.273
  +++ http_main.c	1998/01/24 16:27:55	1.274
  @@ -2424,10 +2424,10 @@
    */
   
   
  -conn_rec *new_connection(pool *p, server_rec *server, BUFF *inout,
  -			 const struct sockaddr_in *remaddr,
  -			 const struct sockaddr_in *saddr,
  -			 int child_num)
  +conn_rec *ap__new_connection(pool *p, server_rec *server, BUFF *inout,
  +			     const struct sockaddr_in *remaddr,
  +			     const struct sockaddr_in *saddr,
  +			     int child_num)
   {
       conn_rec *conn = (conn_rec *) pcalloc(p, sizeof(conn_rec));
   
  @@ -3111,10 +3111,10 @@
   #endif
   	bpushfd(conn_io, csd, dupped_csd);
   
  -	current_conn = new_connection(ptrans, server_conf, conn_io,
  -				      (struct sockaddr_in *) &sa_client,
  -				      (struct sockaddr_in *) &sa_server,
  -				      my_child_num);
  +	current_conn = ap__new_connection(ptrans, server_conf, conn_io,
  +				          (struct sockaddr_in *) &sa_client,
  +				          (struct sockaddr_in *) &sa_server,
  +				          my_child_num);
   
   	/*
   	 * Read and process each request found on our connection
  @@ -3790,9 +3790,9 @@
   	cio->fd = fileno(stdout);
   #endif
   	cio->fd_in = fileno(stdin);
  -	conn = new_connection(ptrans, server_conf, cio,
  -			      (struct sockaddr_in *) &sa_client,
  -			      (struct sockaddr_in *) &sa_server, -1);
  +	conn = ap__new_connection(ptrans, server_conf, cio,
  +			          (struct sockaddr_in *) &sa_client,
  +			          (struct sockaddr_in *) &sa_server, -1);
   	r = read_request(conn);
   	if (r)
   	    process_request(r);	/* else premature EOF (ignore) */
  @@ -4140,10 +4140,10 @@
   #endif
   	bpushfd(conn_io, csd, dupped_csd);
   
  -	current_conn = new_connection(ptrans, server_conf, conn_io,
  -				      (struct sockaddr_in *) &sa_client,
  -				      (struct sockaddr_in *) &sa_server,
  -				      child_num);
  +	current_conn = ap__new_connection(ptrans, server_conf, conn_io,
  +				          (struct sockaddr_in *) &sa_client,
  +				          (struct sockaddr_in *) &sa_server,
  +				          child_num);
   
   	/*
   	 * Read and process each request found on our connection
  
  
  

Mime
View raw message