[mod-xhtml-neg-cvs] mod_xhtml_neg-2.0 mod_xhtml_neg.c,1.4,1.5

[<ru...@us...>]

Update of /cvsroot/mod-xhtml-neg/mod_xhtml_neg-2.0
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7086

Modified Files:
	mod_xhtml_neg.c 
Log Message:
Fixed compilation warning and don't both explicitly calling ap_set_etag any more. The default handler will do that for us.

Index: mod_xhtml_neg.c
===================================================================
RCS file: /cvsroot/mod-xhtml-neg/mod_xhtml_neg-2.0/mod_xhtml_neg.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** mod_xhtml_neg.c	15 Mar 2004 03:09:23 -0000	1.4
--- mod_xhtml_neg.c	15 Mar 2004 04:29:17 -0000	1.5
***************
*** 522,527 ****
   */
  
! static const char *merge_validators(apr_pool_t *p, const char *old_variant,
!                                                    const char *new_variant)
  {
      int old_weak, new_weak;
--- 522,527 ----
   */
  
! static char *merge_validators(apr_pool_t *p, char *old_variant,
!                                              char *new_variant)
  {
      int old_weak, new_weak;
***************
*** 1150,1163 ****
           * by Apache.
           */
-         char *etag = merge_validators( r->pool, r->vlist_validator,
-                                   result_rec->hashcode );
          r->content_type = reconstruct_content_type( r->pool, result_rec );
!         r->vlist_validator = etag;
!         ap_set_etag(r);
  
          if( xns->log_fd != NULL ) {
              logmessage = apr_pstrcat(r->pool,
                      "Best content-type: ", r->content_type, "\n",
!                     "New validator is: ", etag, "\n",
                      NULL );
              logsize = mod_xhtml_strlen( logmessage );
--- 1150,1161 ----
           * by Apache.
           */
          r->content_type = reconstruct_content_type( r->pool, result_rec );
!         r->vlist_validator = merge_validators( r->pool, r->vlist_validator,
!                                   result_rec->hashcode );
  
          if( xns->log_fd != NULL ) {
              logmessage = apr_pstrcat(r->pool,
                      "Best content-type: ", r->content_type, "\n",
!                     "New validator is: ", r->vlist_validator, "\n",
                      NULL );
              logsize = mod_xhtml_strlen( logmessage );