diff options
| author | Gerald Carter <jerry@samba.org> | 2004-10-25 19:25:54 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2004-10-25 19:25:54 +0000 |
| commit | 317ab676bf28d3922dc0fba02e908a766035872f (patch) | |
| tree | d9ea00a371f92740e58b95991b4b56723454304d /source/web/cgi.c | |
| parent | 943c0aaaeb5a24a9501a164e9a765384e8e8a2ff (diff) | |
| download | samba-317ab676bf28d3922dc0fba02e908a766035872f.tar.gz samba-317ab676bf28d3922dc0fba02e908a766035872f.tar.xz samba-317ab676bf28d3922dc0fba02e908a766035872f.zip | |
r3220: merging current 3.0 code to release branch
Diffstat (limited to 'source/web/cgi.c')
| -rw-r--r-- | source/web/cgi.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/web/cgi.c b/source/web/cgi.c index b1aa8ae754c..cf309c364e2 100644 --- a/source/web/cgi.c +++ b/source/web/cgi.c @@ -19,7 +19,7 @@ #include "includes.h" -#include "../web/swat_proto.h" +#include "web/swat_proto.h" #define MAX_VARIABLES 10000 @@ -196,18 +196,18 @@ void cgi_load_variables(void) printf("<!== End dump in cgi_load_variables() ==>\n"); #endif - /* variables from the client are in display charset - convert them - to our internal charset before use */ + /* variables from the client are in UTF-8 - convert them + to our internal unix charset before use */ for (i=0;i<num_variables;i++) { pstring dest; - convert_string(CH_DISPLAY, CH_UNIX, + convert_string(CH_UTF8, CH_UNIX, variables[i].name, -1, dest, sizeof(dest), True); free(variables[i].name); variables[i].name = strdup(dest); - convert_string(CH_DISPLAY, CH_UNIX, + convert_string(CH_UTF8, CH_UNIX, variables[i].value, -1, dest, sizeof(dest), True); free(variables[i].value); @@ -334,11 +334,11 @@ static BOOL cgi_handle_authorization(char *line) } *p = 0; - convert_string(CH_DISPLAY, CH_UNIX, + convert_string(CH_UTF8, CH_UNIX, line, -1, user, sizeof(user), True); - convert_string(CH_DISPLAY, CH_UNIX, + convert_string(CH_UTF8, CH_UNIX, p+1, -1, user_pass, sizeof(user_pass), True); |