Changeset 312

Timestamp:

04/28/2005 01:04:42 PM (3 years ago)

Author:

jan

Message:

allow numbers in the header names

Location:

trunk

Files:

• src/mod_cgi.c (modified) (1 diff)
• src/mod_fastcgi.c (modified) (1 diff)
• src/mod_ssi.c (modified) (1 diff)
• tests/mod-cgi.t (modified) (2 diffs)

trunk/src/mod_cgi.c

@@ -943 +943 @@
                                 
                                 for (j = 0; j < ds->key->used - 1; j++) {
-                                        p->tmp_buf->ptr[p->tmp_buf->used++] = 
-                                                isalpha((unsigned char)ds->key->ptr[j]) ? 
-                                                toupper((unsigned char)ds->key->ptr[j]) : '_';
+                                        char cr = '_';
+                                        if (light_isalpha(ds->key->ptr[j])) {
+                                                /* upper-case */
+                                                cr = ds->key->ptr[j] & ~32;
+                                        } else if (light_isdigit(ds->key->ptr[j])) {
+                                                /* copy */
+                                                cr = ds->key->ptr[j];
+                                        }
+                                        p->tmp_buf->ptr[p->tmp_buf->used++] = cr;
                                 }
                                 p->tmp_buf->ptr[p->tmp_buf->used++] = '\0';

trunk/src/mod_fastcgi.c

@@ -1532 +1532 @@
                         buffer_prepare_append(srv->tmp_buf, ds->key->used + 2);
                         for (j = 0; j < ds->key->used - 1; j++) {
-                                srv->tmp_buf->ptr[srv->tmp_buf->used++] = 
-                                        light_isalpha(ds->key->ptr[j]) ? 
-                                        ds->key->ptr[j] & ~32 : '_';
+                                char c = '_';
+                                if (light_isalpha(ds->key->ptr[j])) {
+                                        /* upper-case */
+                                        c = ds->key->ptr[j] & ~32;
+                                } else if (light_isdigit(ds->key->ptr[j])) {
+                                        /* copy */
+                                        c = ds->key->ptr[j];
+                                }
+                                srv->tmp_buf->ptr[srv->tmp_buf->used++] = c;
                         }
                         srv->tmp_buf->ptr[srv->tmp_buf->used++] = '\0';

trunk/src/mod_ssi.c

@@ -174 +174 @@
                         buffer_prepare_append(srv->tmp_buf, ds->key->used + 2);
                         for (j = 0; j < ds->key->used - 1; j++) {
-                                srv->tmp_buf->ptr[srv->tmp_buf->used++] = 
-                                        isalpha((unsigned char)ds->key->ptr[j]) ? 
-                                        toupper((unsigned char)ds->key->ptr[j]) : '_';
+                                char c = '_';
+                                if (light_isalpha(ds->key->ptr[j])) {
+                                        /* upper-case */
+                                        c = ds->key->ptr[j] & ~32;
+                                } else if (light_isdigit(ds->key->ptr[j])) {
+                                        /* copy */
+                                        c = ds->key->ptr[j];
+                                }
+                                srv->tmp_buf->ptr[srv->tmp_buf->used++] = c;
                         }
                         srv->tmp_buf->ptr[srv->tmp_buf->used] = '\0';

trunk/tests/mod-cgi.t

@@ -3 +3 @@
 use strict;
 use IO::Socket;
-use Test::More tests => 9;
+use Test::More tests => 10;
 
 my $basedir = (defined $ENV{'top_builddir'} ? $ENV{'top_builddir'} : '..');
@@ -234 +234 @@
 
 @request  = ( <<EOF
+GET /get-header.pl?HTTP_XX_YY123 HTTP/1.0
+xx-yy123: foo
+EOF
+ );
+@response = ( { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, 'HTTP-Content' => 'foo' } );
+ok(handle_http == 0, 'cgi-env: quoting headers with numbers');
+
+@request  = ( <<EOF
 GET /get-header.pl?HTTP_HOST HTTP/1.0
 Host: www.example.org