httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Dean Gaudet <dgau...@hyperreal.com>
Subject cvs commit: apache/src mod_rewrite.c mod_rewrite.h
Date Sat, 12 Apr 1997 04:19:51 GMT
dgaudet     97/04/11 21:19:51

  Modified:    src       mod_rewrite.c mod_rewrite.h
  Log:
  Sync to 3.0.3
  
  Reviewed by:	Dean
  Submitted by:	Ralf
  
  Revision  Changes    Path
  1.25      +12 -12    apache/src/mod_rewrite.c
  
  Index: mod_rewrite.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/mod_rewrite.c,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -C3 -r1.24 -r1.25
  *** mod_rewrite.c	1997/03/29 01:55:57	1.24
  --- mod_rewrite.c	1997/04/12 04:19:49	1.25
  ***************
  *** 61,67 ****
    **  |_| |_| |_|\___/ \__,_|___|_|  \___| \_/\_/ |_|  |_|\__\___|
    **                       |_____|
    **
  ! **  URL Rewriting Module, Version 3.0.2 (26-Mar-1997)
    **
    **  This module uses a rule-based rewriting engine (based on a
    **  regular-expression parser) to rewrite requested URLs on the fly. 
  --- 61,67 ----
    **  |_| |_| |_|\___/ \__,_|___|_|  \___| \_/\_/ |_|  |_|\__\___|
    **                       |_____|
    **
  ! **  URL Rewriting Module, Version 3.0.3 (08-Apr-1997)
    **
    **  This module uses a rule-based rewriting engine (based on a
    **  regular-expression parser) to rewrite requested URLs on the fly. 
  ***************
  *** 878,891 ****
        /* add the canonical URI of this URL */
        thisserver = r->server->server_hostname;
    #ifdef APACHE_SSL
  !     if (((!r->connection->client->ssl) && (r->server->port == 80))
||
             ((r->connection->client->ssl) && (r->server->port == 443)))
    #else
  !     if (r->server->port == 80)
    #endif 
            thisport = "";
        else {
  !         ap_snprintf(buf, sizeof(buf), ":%d", r->server->port);
            thisport = pstrdup(r->pool, buf);
        }
        thisurl = table_get(r->subprocess_env, ENVVAR_SCRIPT_URL);
  --- 878,891 ----
        /* add the canonical URI of this URL */
        thisserver = r->server->server_hostname;
    #ifdef APACHE_SSL
  !     if (((!r->connection->client->ssl) && (r->server->port == DEFAULT_PORT))
||
             ((r->connection->client->ssl) && (r->server->port == 443)))
    #else
  !     if (r->server->port == DEFAULT_PORT)
    #endif 
            thisport = "";
        else {
  !         ap_snprintf(buf, sizeof(buf), ":%u", r->server->port);
            thisport = pstrdup(r->pool, buf);
        }
        thisurl = table_get(r->subprocess_env, ENVVAR_SCRIPT_URL);
  ***************
  *** 1618,1631 ****
                        strncmp(r->filename, "ftp://", 6) == 0)    ) {
    
    #ifdef APACHE_SSL
  !                 if ((!r->connection->client->ssl && r->server->port
== 80) ||
                        ( r->connection->client->ssl && r->server->port
== 443)  )
    #else
  !                 if (r->server->port == 80)
    #endif
                        port[0] = '\0';
                    else 
  !                     ap_snprintf(port, sizeof(port), ":%d", r->server->port);
                    if (r->filename[0] == '/')
    #ifdef APACHE_SSL
                        ap_snprintf(newuri, sizeof(newuri), "%s://%s%s%s", http_method(r),
r->server->server_hostname, port, r->filename);
  --- 1618,1631 ----
                        strncmp(r->filename, "ftp://", 6) == 0)    ) {
    
    #ifdef APACHE_SSL
  !                 if ((!r->connection->client->ssl && r->server->port
== DEFAULT_PORT) ||
                        ( r->connection->client->ssl && r->server->port
== 443)  )
    #else
  !                 if (r->server->port == DEFAULT_PORT)
    #endif
                        port[0] = '\0';
                    else 
  !                     ap_snprintf(port, sizeof(port), ":%u", r->server->port);
                    if (r->filename[0] == '/')
    #ifdef APACHE_SSL
                        ap_snprintf(newuri, sizeof(newuri), "%s://%s%s%s", http_method(r),
r->server->server_hostname, port, r->filename);
  ***************
  *** 1806,1812 ****
    static void reduce_uri(request_rec *r)
    {
        char *cp;
  !     short port;
        char *portp;
        char *hostp;
        char *url;
  --- 1806,1812 ----
    static void reduce_uri(request_rec *r)
    {
        char *cp;
  !     unsigned short port;
        char *portp;
        char *hostp;
        char *url;
  ***************
  *** 1860,1866 ****
                EOS_PARANOIA(host);
                *cp = '/';
                /* set port */
  !             port = 80;
                /* set remaining url */
                url = cp;
            }
  --- 1860,1866 ----
                EOS_PARANOIA(host);
                *cp = '/';
                /* set port */
  !             port = DEFAULT_PORT;
                /* set remaining url */
                url = cp;
            }
  ***************
  *** 1869,1875 ****
                strncpy(host, hostp, sizeof(host)-1);
                EOS_PARANOIA(host);
                /* set port */
  !             port = 80;
                /* set remaining url */
                url = "/";
            }
  --- 1869,1875 ----
                strncpy(host, hostp, sizeof(host)-1);
                EOS_PARANOIA(host);
                /* set port */
  !             port = DEFAULT_PORT;
                /* set remaining url */
                url = "/";
            }
  ***************
  *** 2579,2585 ****
            result = r->server->server_hostname;
        }
        else if (strcasecmp(var, "SERVER_PORT") == 0) {
  !         ap_snprintf(resultbuf, sizeof(resultbuf), "%d", r->server->port);
            result = resultbuf;
        }
        else if (strcasecmp(var, "SERVER_PROTOCOL") == 0) {
  --- 2579,2585 ----
            result = r->server->server_hostname;
        }
        else if (strcasecmp(var, "SERVER_PORT") == 0) {
  !         ap_snprintf(resultbuf, sizeof(resultbuf), "%u", r->server->port);
            result = resultbuf;
        }
        else if (strcasecmp(var, "SERVER_PROTOCOL") == 0) {
  ***************
  *** 3057,3063 ****
                char *server_hostname     used on compare to r->hostname
                inet_ntoa(r->connection->local_addr.sin_addr)
                                          used on compare to r->hostname
  !             short port                for redirects
                char *path                name of ServerPath
                int pathlen               len of ServerPath
                char *names               Wildcarded names for ServerAlias servers 
  --- 3057,3063 ----
                char *server_hostname     used on compare to r->hostname
                inet_ntoa(r->connection->local_addr.sin_addr)
                                          used on compare to r->hostname
  !             unsigned short port       for redirects
                char *path                name of ServerPath
                int pathlen               len of ServerPath
                char *names               Wildcarded names for ServerAlias servers 
  
  
  
  1.20      +1 -1      apache/src/mod_rewrite.h
  
  Index: mod_rewrite.h
  ===================================================================
  RCS file: /export/home/cvs/apache/src/mod_rewrite.h,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -C3 -r1.19 -r1.20
  *** mod_rewrite.h	1997/03/29 01:55:57	1.19
  --- mod_rewrite.h	1997/04/12 04:19:49	1.20
  ***************
  *** 64,70 ****
    **  |_| |_| |_|\___/ \__,_|___|_|  \___| \_/\_/ |_|  |_|\__\___|
    **                       |_____|
    **
  ! **  URL Rewriting Module, Version 3.0.2 (26-Mar-1997)
    **
    **  This module uses a rule-based rewriting engine (based on a
    **  regular-expression parser) to rewrite requested URLs on the fly. 
  --- 64,70 ----
    **  |_| |_| |_|\___/ \__,_|___|_|  \___| \_/\_/ |_|  |_|\__\___|
    **                       |_____|
    **
  ! **  URL Rewriting Module, Version 3.0.3 (04-Apr-1997)
    **
    **  This module uses a rule-based rewriting engine (based on a
    **  regular-expression parser) to rewrite requested URLs on the fly. 
  
  
  

Mime
View raw message