clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

MFH:

Browse Source 
- Fix memory leak found by Osman
- Merge strlen to sizof change from CLI
This commit is contained in:
Marcus Boerger 2008-03-25 22:05:22 +00:00
parent c0b4683661
commit 7916f1c1f0
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
sapi/embed/php_embed.c
View File

@ -24,13 +24,13 @@
#include <fcntl.h>
#endif
#define HARDCODED_INI \
"html_errors=0\n" \
"register_argc_argv=1\n" \
"implicit_flush=1\n" \
"output_buffering=0\n" \
"max_execution_time=0\n" \
"max_input_time=-1\n"
const char HARDCODED_INI[] =
"html_errors=0\n"
"register_argc_argv=1\n"
"implicit_flush=1\n"
"output_buffering=0\n"
"max_execution_time=0\n"
"max_input_time=-1\n\0";
static char* php_embed_read_cookies(TSRMLS_D)
{
@ -146,7 +146,6 @@ int php_embed_init(int argc, char **argv PTSRMLS_DC)
#ifdef ZTS
void ***tsrm_ls = NULL;
#endif
int ini_entries_len = 0;
#ifdef HAVE_SIGNAL_H
#if defined(SIGPIPE) && defined(SIG_IGN)
@ -159,6 +158,14 @@ int php_embed_init(int argc, char **argv PTSRMLS_DC)
#endif
#endif
#ifdef ZTS
tsrm_startup(1, 1, 0, NULL);
tsrm_ls = ts_resource(0);
*ptsrm_ls = tsrm_ls;
#endif
sapi_startup(&php_embed_module);
#ifdef PHP_WIN32
_fmode = _O_BINARY; /*sets default for file streams to binary */
setmode(_fileno(stdin), O_BINARY); /* make the stdio mode be binary */
@ -166,18 +173,8 @@ int php_embed_init(int argc, char **argv PTSRMLS_DC)
setmode(_fileno(stderr), O_BINARY); /* make the stdio mode be binary */
#endif
#ifdef ZTS
tsrm_startup(1, 1, 0, NULL);
tsrm_ls = ts_resource(0);
*ptsrm_ls = tsrm_ls;
#endif
ini_entries_len = strlen(HARDCODED_INI);
php_embed_module.ini_entries = malloc(ini_entries_len+2);
memcpy(php_embed_module.ini_entries, HARDCODED_INI, ini_entries_len+1);
php_embed_module.ini_entries[ini_entries_len+1] = 0;
sapi_startup(&php_embed_module);
php_embed_module.ini_entries = malloc(sizeof(HARDCODED_INI));
memcpy(php_embed_module.ini_entries, HARDCODED_INI, sizeof(HARDCODED_INI));
if (argv) {
php_embed_module.executable_location = argv[0];