diff options
| author | Felipe Pena <felipensp@gmail.com> | 2015-02-16 12:21:20 -0200 |
|---|---|---|
| committer | Felipe Pena <felipensp@gmail.com> | 2015-02-16 12:21:20 -0200 |
| commit | a80ad10d9b3e759c869a1d075fa89cb19ec740b5 (patch) | |
| tree | ee3c3917ef8fe689b1b4ce6a0d188def813baa80 | |
| parent | 9973df7b4f7fd08e25bb655c48ea15dbe812cdb3 (diff) | |
| parent | 02de601ff8330a9ee2fa047d9098521908f6e583 (diff) | |
| download | php-git-a80ad10d9b3e759c869a1d075fa89cb19ec740b5.tar.gz | |
- Fix merge
| -rw-r--r-- | ext/soap/php_xml.c | 3 | ||||
| -rw-r--r-- | sapi/fpm/fpm/fpm_request.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ext/soap/php_xml.c b/ext/soap/php_xml.c index b32acdf41d..35d2e4e8b0 100644 --- a/ext/soap/php_xml.c +++ b/ext/soap/php_xml.c @@ -100,6 +100,9 @@ xmlDocPtr soap_xmlParseFile(const char *filename) ctxt->sax->warning = NULL; ctxt->sax->error = NULL; /*ctxt->sax->fatalError = NULL;*/ +#if LIBXML_VERSION >= 20703 + ctxt->options |= XML_PARSE_HUGE; +#endif old = php_libxml_disable_entity_loader(1); xmlParseDocument(ctxt); php_libxml_disable_entity_loader(old); diff --git a/sapi/fpm/fpm/fpm_request.c b/sapi/fpm/fpm/fpm_request.c index 1e8016005a..ec8601b478 100644 --- a/sapi/fpm/fpm/fpm_request.c +++ b/sapi/fpm/fpm/fpm_request.c @@ -219,8 +219,6 @@ void fpm_request_finished() /* {{{ */ proc->request_stage = FPM_REQUEST_FINISHED; proc->tv = now; - memset(&proc->accepted, 0, sizeof(proc->accepted)); - proc->accepted_epoch = 0; fpm_scoreboard_proc_release(proc); } /* }}} */ |