diff options
| author | foobar <sniper@php.net> | 2001-04-04 20:46:26 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2001-04-04 20:46:26 +0000 |
| commit | c34d2b91dad13d793baf94180457a935e04a9526 (patch) | |
| tree | f0d95c5ffd241ac49ce4e08571dafaadcb3c8225 /ext | |
| parent | 382e3c5ad664f206e2fbd9ebb4b2685a99e5f9b7 (diff) | |
| download | php-git-c34d2b91dad13d793baf94180457a935e04a9526.tar.gz | |
Added new configuration directives:
arg_separator.input and arg_separator.output
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/standard/url_scanner.c | 6 | ||||
| -rw-r--r-- | ext/standard/url_scanner_ex.c | 8 | ||||
| -rw-r--r-- | ext/standard/url_scanner_ex.re | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/ext/standard/url_scanner.c b/ext/standard/url_scanner.c index b93741d52f..aacfcff8e8 100644 --- a/ext/standard/url_scanner.c +++ b/ext/standard/url_scanner.c @@ -67,12 +67,12 @@ static char *url_attr_addon(const char *tag,const char *attr,const char *val,con if(flag) { if(!strstr(val,buf)&&!strchr(val,':')) { - char *result = (char *)emalloc(strlen(buf)+strlen(PG(arg_separator))+1); + char *result = (char *)emalloc(strlen(buf)+strlen(PG(arg_separator).output)+1); int n; if(strchr(val,'?')) { - strcpy(result,PG(arg_separator)); - n=strlen(PG(arg_separator)); + strcpy(result,PG(arg_separator).output); + n=strlen(PG(arg_separator).output); } else { *result='?'; n=1; diff --git a/ext/standard/url_scanner_ex.c b/ext/standard/url_scanner_ex.c index 9ea31a0c70..562e314af5 100644 --- a/ext/standard/url_scanner_ex.c +++ b/ext/standard/url_scanner_ex.c @@ -1,5 +1,5 @@ -/* Generated by re2c 0.5 on Tue Jan 9 17:13:20 2001 */ -#line 1 "/home/sas/src/php4/ext/standard/url_scanner_ex.re" +/* Generated by re2c 0.5 on Wed Apr 4 19:29:46 2001 */ +#line 1 "/usr/src/web/php/php4/ext/standard/url_scanner_ex.re" /* +----------------------------------------------------------------------+ | PHP version 4.0 | @@ -140,7 +140,7 @@ static inline void tag_arg(url_adapt_state_ex_t *ctx, char quote PLS_DC) smart_str_appendc(&ctx->result, quote); if (f) { - append_modified_url(&ctx->val, &ctx->result, &ctx->q_name, &ctx->q_value, PG(arg_separator)); + append_modified_url(&ctx->val, &ctx->result, &ctx->q_name, &ctx->q_value, PG(arg_separator).output); } else { smart_str_append(&ctx->result, &ctx->val); } @@ -670,7 +670,7 @@ char *url_adapt_single_url(const char *url, size_t urllen, const char *name, con smart_str_sets(&sname, name); smart_str_sets(&sval, value); - append_modified_url(&surl, &buf, &sname, &sval, PG(arg_separator)); + append_modified_url(&surl, &buf, &sname, &sval, PG(arg_separator).output); smart_str_0(&buf); if (newlen) *newlen = buf.len; diff --git a/ext/standard/url_scanner_ex.re b/ext/standard/url_scanner_ex.re index 5a8fefd815..681f08c2c0 100644 --- a/ext/standard/url_scanner_ex.re +++ b/ext/standard/url_scanner_ex.re @@ -138,7 +138,7 @@ static inline void tag_arg(url_adapt_state_ex_t *ctx, char quote PLS_DC) smart_str_appendc(&ctx->result, quote); if (f) { - append_modified_url(&ctx->val, &ctx->result, &ctx->q_name, &ctx->q_value, PG(arg_separator)); + append_modified_url(&ctx->val, &ctx->result, &ctx->q_name, &ctx->q_value, PG(arg_separator).output); } else { smart_str_append(&ctx->result, &ctx->val); } @@ -313,7 +313,7 @@ char *url_adapt_single_url(const char *url, size_t urllen, const char *name, con smart_str_sets(&sname, name); smart_str_sets(&sval, value); - append_modified_url(&surl, &buf, &sname, &sval, PG(arg_separator)); + append_modified_url(&surl, &buf, &sname, &sval, PG(arg_separator).output); smart_str_0(&buf); if (newlen) *newlen = buf.len; |