You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by Alexei Kosut <ak...@hyperreal.com> on 1997/06/22 22:35:27 UTC
cvs commit: apache/src util.c
akosut 97/06/22 13:35:27
Modified: src util.c
Log:
Fix pregsub to check the correct value, and not try and substitute
matches that didn't occur.
Reviewed by: Ralf S. Engelschall, Randy Terbush
Revision Changes Path
1.54 +2 -2 apache/src/util.c
Index: util.c
===================================================================
RCS file: /export/home/cvs/apache/src/util.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -c -C3 -r1.53 -r1.54
*** util.c 1997/06/15 19:22:34 1.53
--- util.c 1997/06/22 20:35:26 1.54
***************
*** 232,238 ****
if (c == '\\' && (*src == '$' || *src == '&'))
c = *src++;
len++;
! } else if (no <= nmatch && pmatch[no].rm_so < pmatch[no].rm_eo) {
len += pmatch[no].rm_eo - pmatch[no].rm_so;
}
--- 232,238 ----
if (c == '\\' && (*src == '$' || *src == '&'))
c = *src++;
len++;
! } else if (no < nmatch && pmatch[no].rm_so < pmatch[no].rm_eo) {
len += pmatch[no].rm_eo - pmatch[no].rm_so;
}
***************
*** 256,262 ****
if (c == '\\' && (*src == '$' || *src == '&'))
c = *src++;
*dst++ = c;
! } else if (no <= nmatch && pmatch[no].rm_so < pmatch[no].rm_eo) {
len = pmatch[no].rm_eo - pmatch[no].rm_so;
strncpy(dst, source + pmatch[no].rm_so, len);
dst += len;
--- 256,262 ----
if (c == '\\' && (*src == '$' || *src == '&'))
c = *src++;
*dst++ = c;
! } else if (no < nmatch && pmatch[no].rm_so < pmatch[no].rm_eo) {
len = pmatch[no].rm_eo - pmatch[no].rm_so;
strncpy(dst, source + pmatch[no].rm_so, len);
dst += len;