archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

First attempt at moving the old RFC1867 support to the right place

Browse source
This commit is contained in:
Zeev Suraski 1999-06-12 17:50:39 +00:00
parent c50cd2df99
commit 96bfbc7904
8 changed files with 268 additions and 277 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/standard/Makefile.am
View file

@ -7,7 +7,7 @@ libphpext_standard_a_SOURCES=\
html.c image.c info.c link.c mail.c math.c md5.c microtime.c \
pack.c pageinfo.c rand.c reg.c soundex.c string.c \
syslog.c type.c uniqid.c url.c iptc.c var.c quot_print.c \
cyr_convert.c flock_compat.c crypt.c dl.c head.c mime.c post.c
cyr_convert.c flock_compat.c crypt.c dl.c head.c post.c
#number.o: number.c
# $(CC) $(CFLAGS) -w@WARNING_LEVEL@ -c $< -o $@

247
ext/standard/mime.c
View file

@ -1,247 +0,0 @@
/*
+----------------------------------------------------------------------+
| PHP HTML Embedded Scripting Language Version 3.0 |
+----------------------------------------------------------------------+
| Copyright (c) 1997,1998 PHP Development Team (See Credits file) |
+----------------------------------------------------------------------+
| This program is free software; you can redistribute it and/or modify |
| it under the terms of one of the following licenses: |
| |
| A) the GNU General Public License as published by the Free Software |
| Foundation; either version 2 of the License, or (at your option) |
| any later version. |
| |
| B) the PHP License as published by the PHP Development Team and |
| included in the distribution in the file: LICENSE |
| |
| This program is distributed in the hope that it will be useful, |
| but WITHOUT ANY WARRANTY; without even the implied warranty of |
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| GNU General Public License for more details. |
| |
| You should have received a copy of both licenses referred to here. |
| If you did not, or have any questions about PHP licensing, please |
| contact core@php.net. |
+----------------------------------------------------------------------+
| Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> |
+----------------------------------------------------------------------+
*/
/* $Id$ */
#include <stdio.h>
#include "php.h"
#include "ext/standard/php3_standard.h"
#include "post.h"
#include "mime.h"
#include "zend_globals.h"
#include "php_globals.h"
#ifndef THREAD_SAFE
int le_uploads;
extern HashTable list;
#endif
#define NEW_BOUNDARY_CHECK 1
#define SAFE_RETURN { if (namebuf) efree(namebuf); if (filenamebuf) efree(filenamebuf); if (lbuf) efree(lbuf); return; }
/*
* Split raw mime stream up into appropriate components
*/
void php3_mime_split(char *buf, int cnt, char *boundary, pval *http_post_vars PLS_DC)
{
char *ptr, *loc, *loc2, *s, *name, *filename, *u, *fn;
int len, state = 0, Done = 0, rem, urem;
long bytes, max_file_size = 0;
char *namebuf=NULL, *filenamebuf=NULL, *lbuf=NULL;
FILE *fp;
int itype;
ELS_FETCH();
ptr = buf;
rem = cnt;
len = strlen(boundary);
while ((ptr - buf < cnt) && !Done) {
switch (state) {
case 0: /* Looking for mime boundary */
loc = memchr(ptr, *boundary, cnt);
if (loc) {
if (!strncmp(loc, boundary, len)) {
state = 1;
rem -= (loc - ptr) + len + 2;
ptr = loc + len + 2;
} else {
rem -= (loc - ptr) + 1;
ptr = loc + 1;
}
} else {
Done = 1;
}
break;
case 1: /* Check content-disposition */
if (strncasecmp(ptr, "Content-Disposition: form-data;", 31)) {
if (rem < 31) {
SAFE_RETURN;
}
php3_error(E_WARNING, "File Upload Mime headers garbled [%c%c%c%c%c]", *ptr, *(ptr + 1), *(ptr + 2), *(ptr + 3), *(ptr + 4));
SAFE_RETURN;
}
loc = memchr(ptr, '\n', rem);
name = strstr(ptr, " name=\"");
if (name && name < loc) {
name += 7;
s = memchr(name, '\"', loc - name);
if (!s) {
php3_error(E_WARNING, "File Upload Mime headers garbled [%c%c%c%c%c]", *name, *(name + 1), *(name + 2), *(name + 3), *(name + 4));
SAFE_RETURN;
}
if (namebuf) {
efree(namebuf);
}
namebuf = estrndup(name, s-name);
if (lbuf) {
efree(lbuf);
}
lbuf = emalloc(s-name + MAX(MAX(sizeof("_name"),sizeof("_size")),sizeof("_type")));
state = 2;
loc2 = memchr(loc + 1, '\n', rem);
rem -= (loc2 - ptr) + 1;
ptr = loc2 + 1;
} else {
php3_error(E_WARNING, "File upload error - no name component in content disposition");
SAFE_RETURN;
}
filename = strstr(s, " filename=\"");
if (filename && filename < loc) {
filename += 11;
s = memchr(filename, '\"', loc - filename);
if (!s) {
php3_error(E_WARNING, "File Upload Mime headers garbled [%c%c%c%c%c]", *filename, *(filename + 1), *(filename + 2), *(filename + 3), *(filename + 4));
SAFE_RETURN;
}
if (filenamebuf) {
efree(filenamebuf);
}
filenamebuf = estrndup(filename, s-filename);
sprintf(lbuf, "%s_name", namebuf);
s = strrchr(filenamebuf, '\\');
if (s && s > filenamebuf) {
SET_VAR_STRING(lbuf, estrdup(s + 1));
} else {
SET_VAR_STRING(lbuf, estrdup(filenamebuf));
}
state = 3;
if ((loc2 - loc) > 2) {
if (!strncasecmp(loc + 1, "Content-Type:", 13)) {
*(loc2 - 1) = '\0';
sprintf(lbuf, "%s_type", namebuf);
SET_VAR_STRING(lbuf, estrdup(loc + 15));
*(loc2 - 1) = '\n';
}
rem -= 2;
ptr += 2;
}
}
break;
case 2: /* handle form-data fields */
loc = memchr(ptr, *boundary, rem);
u = ptr;
while (loc) {
if (!strncmp(loc, boundary, len))
break;
u = loc + 1;
urem = rem - (loc - ptr) - 1;
loc = memchr(u, *boundary, urem);
}
if (!loc) {
php3_error(E_WARNING, "File Upload Field Data garbled");
SAFE_RETURN;
}
*(loc - 4) = '\0';
/* Magic function that figures everything out */
_php3_parse_gpc_data(ptr,namebuf,http_post_vars);
/* And a little kludge to pick out special MAX_FILE_SIZE */
itype = php3_check_ident_type(namebuf);
if (itype) {
u = strchr(namebuf, '[');
if (u)
*u = '\0';
}
if (!strcmp(namebuf, "MAX_FILE_SIZE")) {
max_file_size = atol(ptr);
}
if (itype) {
if (u)
*u = '[';
}
rem -= (loc - ptr);
ptr = loc;
state = 0;
break;
case 3: /* Handle file */
loc = memchr(ptr, *boundary, rem);
u = ptr;
while (loc) {
if (!strncmp(loc, boundary, len)
#if NEW_BOUNDARY_CHECK
&& (loc-2>buf && *(loc-2)=='-' && *(loc-1)=='-') /* ensure boundary is prefixed with -- */
&& (loc-2==buf || *(loc-3)=='\n') /* ensure beginning of line */
#endif
) {
break;
}
u = loc + 1;
urem = rem - (loc - ptr) - 1;
loc = memchr(u, *boundary, urem);
}
if (!loc) {
php3_error(E_WARNING, "File Upload Error - No Mime boundary found after start of file header");
SAFE_RETURN;
}
fn = tempnam(PG(upload_tmp_dir), "php");
if ((loc - ptr - 4) > PG(upload_max_filesize)) {
php3_error(E_WARNING, "Max file size of %ld bytes exceeded - file [%s] not saved", PG(upload_max_filesize),namebuf);
bytes=0;
SET_VAR_STRING(namebuf, estrdup("none"));
} else if (max_file_size && ((loc - ptr - 4) > max_file_size)) {
php3_error(E_WARNING, "Max file size exceeded - file [%s] not saved", namebuf);
bytes = 0;
SET_VAR_STRING(namebuf, estrdup("none"));
} else if ((loc - ptr - 4) <= 0) {
bytes = 0;
SET_VAR_STRING(namebuf, estrdup("none"));
} else {
fp = fopen(fn, "w");
if (!fp) {
php3_error(E_WARNING, "File Upload Error - Unable to open temporary file [%s]", fn);
SAFE_RETURN;
}
bytes = fwrite(ptr, 1, loc - ptr - 4, fp);
fclose(fp);
php3_list_insert(fn,le_uploads); /* Tell PHP about the file so the destructor can unlink it later */
if (bytes < (loc - ptr - 4)) {
php3_error(E_WARNING, "Only %d bytes were written, expected to write %ld", bytes, loc - ptr - 4);
}
SET_VAR_STRING(namebuf, estrdup(fn));
}
sprintf(lbuf, "%s_size", namebuf);
SET_VAR_LONG(lbuf, bytes);
state = 0;
rem -= (loc - ptr);
ptr = loc;
break;
}
}
SAFE_RETURN;
}
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
*/

8
ext/standard/mime.h
View file

@ -1,8 +0,0 @@
#ifndef _MIME_H
#define _MIME_H
#include "php_globals.h"
void php3_mime_split(char *buf, int cnt, char *boundary, pval *http_post_vars PLS_DC);
#endif

1
ext/standard/php3_standard.h
View file

@ -64,7 +64,6 @@
#include "php3_crypt.h"
#include "head.h"
#include "post.h"
#include "mime.h"
#define phpext_standard_ptr basic_functions_module_ptr

4
main/SAPI.c
View file

@ -31,7 +31,7 @@
#endif
static SAPI_POST_READER_FUNC(sapi_read_standard_form_data);
SAPI_POST_READER_FUNC(sapi_read_standard_form_data);
#define DEFAULT_POST_CONTENT_TYPE "application/x-www-form-urlencoded"
@ -130,7 +130,7 @@ static void sapi_read_post_data(SLS_D)
}
static SAPI_POST_READER_FUNC(sapi_read_standard_form_data)
SAPI_POST_READER_FUNC(sapi_read_standard_form_data)
{
int read_bytes, total_read_bytes=0;
int allocated_bytes=SAPI_POST_BLOCK_SIZE+1;

2
main/SAPI.h
View file

@ -135,4 +135,6 @@ struct _sapi_module_struct {
#define SAPI_POST_READER_FUNC(post_reader) void post_reader(char *content_type_dup SLS_DC)
SAPI_POST_READER_FUNC(sapi_read_standard_form_data);
#endif /* _NEW_SAPI_H */

273
main/rfc1867.c
View file

@ -1,14 +1,259 @@
/*
+----------------------------------------------------------------------+
| PHP HTML Embedded Scripting Language Version 3.0 |
+----------------------------------------------------------------------+
| Copyright (c) 1997,1998 PHP Development Team (See Credits file) |
+----------------------------------------------------------------------+
| This program is free software; you can redistribute it and/or modify |
| it under the terms of one of the following licenses: |
| |
| A) the GNU General Public License as published by the Free Software |
| Foundation; either version 2 of the License, or (at your option) |
| any later version. |
| |
| B) the PHP License as published by the PHP Development Team and |
| included in the distribution in the file: LICENSE |
| |
| This program is distributed in the hope that it will be useful, |
| but WITHOUT ANY WARRANTY; without even the implied warranty of |
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| GNU General Public License for more details. |
| |
| You should have received a copy of both licenses referred to here. |
| If you did not, or have any questions about PHP licensing, please |
| contact core@php.net. |
+----------------------------------------------------------------------+
| Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> |
+----------------------------------------------------------------------+
*/
/* $Id$ */
#include <stdio.h>
#include "php.h"
#include "ext/standard/php3_standard.h"
#include "zend_globals.h"
#include "php_globals.h"
#include "rfc1867.h"
#ifndef THREAD_SAFE
int le_uploads;
extern HashTable list;
#endif
#define NEW_BOUNDARY_CHECK 1
#define SAFE_RETURN { if (namebuf) efree(namebuf); if (filenamebuf) efree(filenamebuf); if (lbuf) efree(lbuf); return; }
/*
* Split raw mime stream up into appropriate components
*/
void php_mime_split(char *buf, int cnt, char *boundary)
{
char *ptr, *loc, *loc2, *s, *name, *filename, *u, *fn;
int len, state = 0, Done = 0, rem, urem;
long bytes, max_file_size = 0;
char *namebuf=NULL, *filenamebuf=NULL, *lbuf=NULL;
FILE *fp;
int itype;
zval *http_post_vars=NULL;
ELS_FETCH();
PLS_FETCH();
if (PG(track_vars)) {
http_post_vars = (pval *) emalloc(sizeof(pval));
array_init(http_post_vars);
http_post_vars->refcount=1;
http_post_vars->is_ref=0;
zend_hash_add(&EG(symbol_table), "HTTP_POST_VARS", sizeof("HTTP_POST_VARS"), &http_post_vars, sizeof(pval *), NULL);
}
ptr = buf;
rem = cnt;
len = strlen(boundary);
while ((ptr - buf < cnt) && !Done) {
switch (state) {
case 0: /* Looking for mime boundary */
loc = memchr(ptr, *boundary, cnt);
if (loc) {
if (!strncmp(loc, boundary, len)) {
state = 1;
rem -= (loc - ptr) + len + 2;
ptr = loc + len + 2;
} else {
rem -= (loc - ptr) + 1;
ptr = loc + 1;
}
} else {
Done = 1;
}
break;
case 1: /* Check content-disposition */
if (strncasecmp(ptr, "Content-Disposition: form-data;", 31)) {
if (rem < 31) {
SAFE_RETURN;
}
php3_error(E_WARNING, "File Upload Mime headers garbled [%c%c%c%c%c]", *ptr, *(ptr + 1), *(ptr + 2), *(ptr + 3), *(ptr + 4));
SAFE_RETURN;
}
loc = memchr(ptr, '\n', rem);
name = strstr(ptr, " name=\"");
if (name && name < loc) {
name += 7;
s = memchr(name, '\"', loc - name);
if (!s) {
php3_error(E_WARNING, "File Upload Mime headers garbled [%c%c%c%c%c]", *name, *(name + 1), *(name + 2), *(name + 3), *(name + 4));
SAFE_RETURN;
}
if (namebuf) {
efree(namebuf);
}
namebuf = estrndup(name, s-name);
if (lbuf) {
efree(lbuf);
}
lbuf = emalloc(s-name + MAX(MAX(sizeof("_name"),sizeof("_size")),sizeof("_type")));
state = 2;
loc2 = memchr(loc + 1, '\n', rem);
rem -= (loc2 - ptr) + 1;
ptr = loc2 + 1;
} else {
php3_error(E_WARNING, "File upload error - no name component in content disposition");
SAFE_RETURN;
}
filename = strstr(s, " filename=\"");
if (filename && filename < loc) {
filename += 11;
s = memchr(filename, '\"', loc - filename);
if (!s) {
php3_error(E_WARNING, "File Upload Mime headers garbled [%c%c%c%c%c]", *filename, *(filename + 1), *(filename + 2), *(filename + 3), *(filename + 4));
SAFE_RETURN;
}
if (filenamebuf) {
efree(filenamebuf);
}
filenamebuf = estrndup(filename, s-filename);
sprintf(lbuf, "%s_name", namebuf);
s = strrchr(filenamebuf, '\\');
if (s && s > filenamebuf) {
SET_VAR_STRING(lbuf, estrdup(s + 1));
} else {
SET_VAR_STRING(lbuf, estrdup(filenamebuf));
}
state = 3;
if ((loc2 - loc) > 2) {
if (!strncasecmp(loc + 1, "Content-Type:", 13)) {
*(loc2 - 1) = '\0';
sprintf(lbuf, "%s_type", namebuf);
SET_VAR_STRING(lbuf, estrdup(loc + 15));
*(loc2 - 1) = '\n';
}
rem -= 2;
ptr += 2;
}
}
break;
case 2: /* handle form-data fields */
loc = memchr(ptr, *boundary, rem);
u = ptr;
while (loc) {
if (!strncmp(loc, boundary, len))
break;
u = loc + 1;
urem = rem - (loc - ptr) - 1;
loc = memchr(u, *boundary, urem);
}
if (!loc) {
php3_error(E_WARNING, "File Upload Field Data garbled");
SAFE_RETURN;
}
*(loc - 4) = '\0';
/* Magic function that figures everything out */
_php3_parse_gpc_data(ptr,namebuf,http_post_vars);
/* And a little kludge to pick out special MAX_FILE_SIZE */
itype = php3_check_ident_type(namebuf);
if (itype) {
u = strchr(namebuf, '[');
if (u)
*u = '\0';
}
if (!strcmp(namebuf, "MAX_FILE_SIZE")) {
max_file_size = atol(ptr);
}
if (itype) {
if (u)
*u = '[';
}
rem -= (loc - ptr);
ptr = loc;
state = 0;
break;
case 3: /* Handle file */
loc = memchr(ptr, *boundary, rem);
u = ptr;
while (loc) {
if (!strncmp(loc, boundary, len)
#if NEW_BOUNDARY_CHECK
&& (loc-2>buf && *(loc-2)=='-' && *(loc-1)=='-') /* ensure boundary is prefixed with -- */
&& (loc-2==buf || *(loc-3)=='\n') /* ensure beginning of line */
#endif
) {
break;
}
u = loc + 1;
urem = rem - (loc - ptr) - 1;
loc = memchr(u, *boundary, urem);
}
if (!loc) {
php3_error(E_WARNING, "File Upload Error - No Mime boundary found after start of file header");
SAFE_RETURN;
}
fn = tempnam(PG(upload_tmp_dir), "php");
if ((loc - ptr - 4) > PG(upload_max_filesize)) {
php3_error(E_WARNING, "Max file size of %ld bytes exceeded - file [%s] not saved", PG(upload_max_filesize),namebuf);
bytes=0;
SET_VAR_STRING(namebuf, estrdup("none"));
} else if (max_file_size && ((loc - ptr - 4) > max_file_size)) {
php3_error(E_WARNING, "Max file size exceeded - file [%s] not saved", namebuf);
bytes = 0;
SET_VAR_STRING(namebuf, estrdup("none"));
} else if ((loc - ptr - 4) <= 0) {
bytes = 0;
SET_VAR_STRING(namebuf, estrdup("none"));
} else {
fp = fopen(fn, "w");
if (!fp) {
php3_error(E_WARNING, "File Upload Error - Unable to open temporary file [%s]", fn);
SAFE_RETURN;
}
bytes = fwrite(ptr, 1, loc - ptr - 4, fp);
fclose(fp);
php3_list_insert(fn,le_uploads); /* Tell PHP about the file so the destructor can unlink it later */
if (bytes < (loc - ptr - 4)) {
php3_error(E_WARNING, "Only %d bytes were written, expected to write %ld", bytes, loc - ptr - 4);
}
SET_VAR_STRING(namebuf, estrdup(fn));
}
sprintf(lbuf, "%s_size", namebuf);
SET_VAR_LONG(lbuf, bytes);
state = 0;
rem -= (loc - ptr);
ptr = loc;
break;
}
}
SAFE_RETURN;
}
SAPI_POST_READER_FUNC(rfc1867_post_reader)
{
char *boundary;
uint boundary_len;
char input_buffer[FILE_UPLOAD_INPUT_BUFFER_SIZE];
uint read_bytes;
sapi_module.sapi_error(E_COMPILE_ERROR, "File upload is not yet supported");
return;
boundary = strstr(content_type_dup, "boundary");
if (!boundary || !(boundary=strchr(boundary, '='))) {
@ -18,10 +263,18 @@ SAPI_POST_READER_FUNC(rfc1867_post_reader)
boundary++;
boundary_len = strlen(boundary);
for (;;) {
read_bytes = sapi_module.read_post(input_buffer, FILE_UPLOAD_INPUT_BUFFER_SIZE-100 SLS_CC);
if (read_bytes<=0) {
break;
}
sapi_read_standard_form_data(content_type_dup SLS_CC);
if (SG(request_info).post_data) {
php_mime_split(SG(request_info).post_data, SG(request_info).content_length, boundary);
efree(SG(request_info).post_data);
SG(request_info).post_data = NULL;
}
}
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
*/

8
php4dllts.dsp
View file

@ -351,10 +351,6 @@ SOURCE=.\ext\standard\microtime.c
# End Source File
# Begin Source File
SOURCE=.\ext\standard\mime.c
# End Source File
# Begin Source File
SOURCE=.\ext\session\mod_files.c
# End Source File
# Begin Source File
@ -475,10 +471,6 @@ SOURCE=.\ext\standard\md5.h
# End Source File
# Begin Source File
SOURCE=.\ext\standard\mime.h
# End Source File
# Begin Source File
SOURCE=.\ext\bcmath\number.h
# End Source File
# Begin Source File