You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by "Ralf S. Engelschall" <rs...@engelschall.com> on 1997/04/08 09:17:43 UTC
[SYNC] mod_rewrite 3.0.3
Below the sync synchronisation patch to update mod_rewrite from 3.0.2 to
3.0.3. It actually includes both the old "unsigned/signed port" patch from the
29-Mar-1997 and the new one from yesterday.
Greetings,
Ralf S. Engelschall
rse@engelschall.com
www.engelschall.com
*** mod_rewrite.c.old Sat Mar 29 03:00:12 1997
--- mod_rewrite.c Tue Apr 8 09:10:37 1997
***************
*** 63,65 ****
**
! ** URL Rewriting Module, Version 3.0.2 (26-Mar-1997)
**
--- 63,65 ----
**
! ** URL Rewriting Module, Version 3.0.3 (08-Apr-1997)
**
***************
*** 880,885 ****
#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
--- 880,885 ----
#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
***************
*** 887,889 ****
else {
! ap_snprintf(buf, sizeof(buf), ":%d", r->server->port);
thisport = pstrdup(r->pool, buf);
--- 887,889 ----
else {
! ap_snprintf(buf, sizeof(buf), ":%u", r->server->port);
thisport = pstrdup(r->pool, buf);
***************
*** 1620,1625 ****
#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
--- 1620,1625 ----
#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
***************
*** 1627,1629 ****
else
! ap_snprintf(port, sizeof(port), ":%d", r->server->port);
if (r->filename[0] == '/')
--- 1627,1629 ----
else
! ap_snprintf(port, sizeof(port), ":%u", r->server->port);
if (r->filename[0] == '/')
***************
*** 1808,1810 ****
char *cp;
! short port;
char *portp;
--- 1808,1810 ----
char *cp;
! unsigned short port;
char *portp;
***************
*** 1862,1864 ****
/* set port */
! port = 80;
/* set remaining url */
--- 1862,1864 ----
/* set port */
! port = DEFAULT_PORT;
/* set remaining url */
***************
*** 1871,1873 ****
/* set port */
! port = 80;
/* set remaining url */
--- 1871,1873 ----
/* set port */
! port = DEFAULT_PORT;
/* set remaining url */
***************
*** 2581,2583 ****
else if (strcasecmp(var, "SERVER_PORT") == 0) {
! ap_snprintf(resultbuf, sizeof(resultbuf), "%d", r->server->port);
result = resultbuf;
--- 2581,2583 ----
else if (strcasecmp(var, "SERVER_PORT") == 0) {
! ap_snprintf(resultbuf, sizeof(resultbuf), "%u", r->server->port);
result = resultbuf;
***************
*** 3059,3061 ****
used on compare to r->hostname
! short port for redirects
char *path name of ServerPath
--- 3059,3061 ----
used on compare to r->hostname
! unsigned short port for redirects
char *path name of ServerPath
*** mod_rewrite.h.old Sat Mar 29 03:00:12 1997
--- mod_rewrite.h Tue Apr 8 08:12:26 1997
***************
*** 66,68 ****
**
! ** URL Rewriting Module, Version 3.0.2 (26-Mar-1997)
**
--- 66,68 ----
**
! ** URL Rewriting Module, Version 3.0.3 (04-Apr-1997)
**