arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-12 01:53:07 +03:00
Code Activity

fixed win32 build issues with CGI

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/axtls/code/trunk@129 9a5d90b5-6617-0410-8a86-bb477d3ed2e3
This commit is contained in:
cameronrich
2007-09-19 06:51:14 +00:00
parent ab7cbe8310
commit 6ae00e4143
8 changed files with 271 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
httpd/axhttp.h
View File

@ -129,7 +129,9 @@ void procreadhead(struct connstruct *cn);
void procsendhead(struct connstruct *cn);
void procreadfile(struct connstruct *cn);
void procsendfile(struct connstruct *cn);
#if defined(CONFIG_HTTP_HAS_CGI)
void read_post_data(struct connstruct *cn);
#endif
/* misc.c prototypes */
char *my_strncpy(char *dest, const char *src, size_t n);

10
httpd/axhttpd.c
View File

@ -301,10 +301,12 @@ int main(int argc, char *argv[])
FD_ISSET(to->networkdesc, &rfds))
{
active--;
if (to->post_state)
read_post_data(to);
else
procreadhead(to);
#if defined(CONFIG_HTTP_HAS_CGI)
if (to->post_state)
read_post_data(to);
else
#endif
procreadhead(to);
}
if (to->state == STATE_WANT_TO_SEND_HEAD &&

216
httpd/proc.c
View File

@ -49,6 +49,7 @@ static void procdirlisting(struct connstruct *cn);
#if defined(CONFIG_HTTP_HAS_CGI)
static void proccgi(struct connstruct *cn);
static void decode_path_info(struct connstruct *cn, char *path_info);
static int init_read_post_data(char *buf, char *data, struct connstruct *cn, int old_rv);
#endif
#ifdef CONFIG_HTTP_HAS_AUTHORIZATION
static int auth_check(struct connstruct *cn);
@ -281,113 +282,12 @@ static void urlencode(const uint8_t *s, char *t)
#endif
int init_read_post_data(char *buf, char *data, struct connstruct *cn, int old_rv)
{
char *next;
int rv;
char *post_data;
rv=old_rv;
next=data;
/* Too much Post data to send. MAXPOSTDATASIZE should be
configured (now it can be chaged in the header file) */
if (cn->content_length > MAXPOSTDATASIZE)
{
send_error(cn, 418);
return 0;
}
/* remove CRLF */
while ((*next == '\r' || *next == '\n') && (next < &buf[rv]))
next++;
if (cn->post_data == NULL)
{
cn->post_data = (char *) calloc(1, (cn->content_length + 1));
/* Allocate buffer for the POST data that will be used by proccgi
to send POST data to the CGI script */
if (cn->post_data == NULL)
{
printf("axhttpd: could not allocate memory for POST data\n");
TTY_FLUSH();
send_error(cn, 599);
return 0;
}
}
cn->post_state = 0;
cn->post_read = 0;
post_data = cn->post_data;
while (next < &buf[rv])
{
/*copy POST data to buffer*/
*post_data = *next;
post_data++;
next++;
cn->post_read++;
if (cn->post_read == cn->content_length)
{
/* No more POST data to be copied */
*post_data = '\0';
return 1;
}
}
/* More POST data has to be read. read_post_data will continue with that */
cn->post_state = 1;
return 0;
}
void read_post_data(struct connstruct *cn)
{
char buf[MAXREQUESTLENGTH*4], *next;
char *post_data;
int rv;
bzero(buf,MAXREQUESTLENGTH*4);
rv = special_read(cn, buf, sizeof(buf)-1);
if (rv <= 0)
{
if (rv < 0) /* really dead? */
removeconnection(cn);
return;
}
buf[rv] = '\0';
next = buf;
post_data = &cn->post_data[cn->post_read];
while (next < &buf[rv])
{
*post_data = *next;
post_data++;
next++;
cn->post_read++;
if (cn->post_read == cn->content_length)
{
/* No more POST data to be copied */
*post_data='\0';
cn->post_state = 0;
buildactualfile(cn);
cn->state = STATE_WANT_TO_SEND_HEAD;
return;
}
}
/* More POST data to read */
}
void procreadhead(struct connstruct *cn)
{
char buf[MAXREQUESTLENGTH*4], *tp, *next;
int rv;
bzero(buf,MAXREQUESTLENGTH*4);
memset(buf, 0, MAXREQUESTLENGTH*4);
rv = special_read(cn, buf, sizeof(buf)-1);
if (rv <= 0)
{
@ -409,12 +309,14 @@ void procreadhead(struct connstruct *cn)
/* If we have a blank line, advance to next stage */
if (*next == '\r' || *next == '\n')
{
if ((cn->reqtype == TYPE_POST)&&(cn->content_length > 0))
{
if (init_read_post_data(buf,next,cn,rv) == 0)
return;
}
#ifndef WIN32
if (cn->reqtype == TYPE_POST && cn->content_length > 0)
{
if (init_read_post_data(buf,next,cn,rv) == 0)
return;
}
#endif
buildactualfile(cn);
cn->state = STATE_WANT_TO_SEND_HEAD;
return;
@ -860,6 +762,104 @@ static void decode_path_info(struct connstruct *cn, char *path_info)
my_strncpy(cn->filereq, path_info, MAXREQUESTLENGTH);
}
static int init_read_post_data(char *buf, char *data,
struct connstruct *cn, int old_rv)
{
char *next = data;
int rv = old_rv;
char *post_data;
/* Too much Post data to send. MAXPOSTDATASIZE should be
configured (now it can be chaged in the header file) */
if (cn->content_length > MAXPOSTDATASIZE)
{
send_error(cn, 418);
return 0;
}
/* remove CRLF */
while ((*next == '\r' || *next == '\n') && (next < &buf[rv]))
next++;
if (cn->post_data == NULL)
{
cn->post_data = (char *) calloc(1, (cn->content_length + 1));
/* Allocate buffer for the POST data that will be used by proccgi
to send POST data to the CGI script */
if (cn->post_data == NULL)
{
printf("axhttpd: could not allocate memory for POST data\n");
TTY_FLUSH();
send_error(cn, 599);
return 0;
}
}
cn->post_state = 0;
cn->post_read = 0;
post_data = cn->post_data;
while (next < &buf[rv])
{
/*copy POST data to buffer*/
*post_data = *next;
post_data++;
next++;
cn->post_read++;
if (cn->post_read == cn->content_length)
{
/* No more POST data to be copied */
*post_data = '\0';
return 1;
}
}
/* More POST data has to be read. read_post_data will continue with that */
cn->post_state = 1;
return 0;
}
void read_post_data(struct connstruct *cn)
{
char buf[MAXREQUESTLENGTH*4], *next;
char *post_data;
int rv;
bzero(buf,MAXREQUESTLENGTH*4);
rv = special_read(cn, buf, sizeof(buf)-1);
if (rv <= 0)
{
if (rv < 0) /* really dead? */
removeconnection(cn);
return;
}
buf[rv] = '\0';
next = buf;
post_data = &cn->post_data[cn->post_read];
while (next < &buf[rv])
{
*post_data = *next;
post_data++;
next++;
cn->post_read++;
if (cn->post_read == cn->content_length)
{
/* No more POST data to be copied */
*post_data='\0';
cn->post_state = 0;
buildactualfile(cn);
cn->state = STATE_WANT_TO_SEND_HEAD;
return;
}
}
/* More POST data to read */
}
#endif /* CONFIG_HTTP_HAS_CGI */
/* Decode string %xx -> char (in place) */