summaryrefslogtreecommitdiff
path: root/main
Commit message (Collapse)AuthorAgeFilesLines
* 7.0.0alpha1Ferenc Kovacs2015-06-091-2/+2
|
* reverted 0512b38 and 1411ca5Anatol Belski2015-05-262-64/+54
|
* Merge branch 'master' into merge-fastcgiXinchen Hui2015-05-266-20/+0
|\
| * further cleanups with S_IF* macros generalized declarationsAnatol Belski2015-05-255-19/+0
| |
| * remove non-applicable commentAnatol Belski2015-05-241-1/+0
| |
* | Micro optimizationsXinchen Hui2015-05-262-18/+16
| |
* | Merge branch 'master' into merge-fastcgiXinchen Hui2015-05-241-3/+9
|\ \ | |/
| * Merge branch 'PHP-5.6'Anatol Belski2015-05-231-3/+9
| |\ | | | | | | | | | | | | * PHP-5.6: increase the internal post data buffer
| | * increase the internal post data bufferAnatol Belski2015-05-231-3/+9
| | | | | | | | | | | | | | | This brings speedup and fixes issues with var parsing. Default BUFSIZ on Windows is 512 bytes which causes too much reallocation work.
* | | fcgi_is_allowed should not log errorXinchen Hui2015-05-241-1/+1
| | |
* | | add the remaining useful symbols to the exportAnatol Belski2015-05-232-18/+18
| | |
* | | implement necessary symbol exportsAnatol Belski2015-05-232-36/+46
| | |
* | | Avoid multipy allocating of request envXinchen Hui2015-05-242-2/+8
| | |
* | | Use weak function for fcgi_logXinchen Hui2015-05-232-15/+29
| | |
* | | Fixed fpm-side (tests passes)Xinchen Hui2015-05-232-129/+270
| | |
* | | Merge branch 'master' into merge-fastcgiXinchen Hui2015-05-236-61/+66
|\ \ \ | |/ /
| * | code standardXinchen Hui2015-05-161-5/+4
| | |
| * | ups, it should have used Zend MMAnatol Belski2015-05-131-2/+2
| | |
| * | fix build, catch up with linux part for #66048Anatol Belski2015-05-131-3/+3
| | |
| * | Partial revert of 6a819bba40661a9a8d7080994cb2f24b73c5d46c.Dmitry Stogov2015-05-131-6/+6
| | |
| * | Merge branch 'PHP-5.6'Stanislav Malyshev2015-05-121-21/+25
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: fix format update NEWS Add test for bug #69522 Update tests Fix bug #69522 - do not allow int overflow Forgot test file Fix bug #69403 and other int overflows Fixed bug #69418 - more s->p fixes for filenames Fixed bug #69364 - use smart_str to assemble strings Fix bug #69453 - don't try to cut empty string Fix bug #69545 - avoid overflow when reading list Conflicts: Zend/zend_alloc.c Zend/zend_operators.c ext/ftp/ftp.c ext/pcntl/pcntl.c ext/standard/basic_functions.c ext/standard/dir.c ext/standard/file.c ext/standard/pack.c ext/standard/string.c main/rfc1867.c
| | * Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-05-121-24/+27
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: fix format update NEWS Add test for bug #69522 Update tests Fix bug #69522 - do not allow int overflow Forgot test file Fix bug #69403 and other int overflows Fixed bug #69418 - more s->p fixes for filenames Fixed bug #69364 - use smart_str to assemble strings Fix bug #69453 - don't try to cut empty string Fix bug #69545 - avoid overflow when reading list Conflicts: ext/standard/pack.c
| | | * Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-05-121-24/+27
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: fix format update NEWS Add test for bug #69522 Update tests Fix bug #69522 - do not allow int overflow Forgot test file Fix bug #69403 and other int overflows Fixed bug #69418 - more s->p fixes for filenames Fixed bug #69364 - use smart_str to assemble strings Fix bug #69453 - don't try to cut empty string Fix bug #69545 - avoid overflow when reading list Conflicts: ext/pcntl/pcntl.c ext/standard/basic_functions.c ext/standard/pack.c ext/standard/tests/dir/opendir_variation1-win32.phpt
| | | | * Fixed bug #69364 - use smart_str to assemble stringsStanislav Malyshev2015-05-091-24/+27
| | | | |
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Julien Pauli2015-05-122-11/+11
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * PHP-5.5: Fix for #66048
| | | * | Fix for #66048Julien Pauli2015-05-122-11/+11
| | | | |
| | | * | 5.5.26 nowJulien Pauli2015-04-291-3/+3
| | | | |
| | | * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-04-141-4/+4
| | | |\ \ | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: 5.4.41 next fix CVE num update NEWS Fix bug #69441 (Buffer Overflow when parsing tar/zip/phar in phar_set_inode) fix type in fix for #69085 fix CVE num Conflicts: configure.in main/php_version.h
| | | | * 5.4.41 nextStanislav Malyshev2015-04-141-3/+3
| | | | |
| | | | * 5.4.40 nextStanislav Malyshev2015-03-171-3/+3
| | | | |
| | | | * 5.4.39 nextStanislav Malyshev2015-02-171-3/+3
| | | | |
| | | * | 5.5.24RC1php-5.5.24RC1Julien Pauli2015-03-311-2/+2
| | | | |
| | * | | 5.6.10 will be nextFerenc Kovacs2015-04-301-3/+3
| | | | |
| | * | | 5.6.9 is up nextFerenc Kovacs2015-04-011-3/+3
| | | | |
| | * | | oops, no idea how this got inStanislav Malyshev2015-03-171-3/+3
| | | | |
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-03-171-3/+3
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | * PHP-5.5: Fix bug #69248 - heap overflow vulnerability in regcomp.c add test for bug #68976
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-03-081-1/+1
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: added missing parentheses Fix #67626 Fix #63486 Conflicts: main/streams/userspace.c
| | | * | Merge branch 'pull-request/1106' into PHP-5.5Stanislav Malyshev2015-03-081-1/+11
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | * pull-request/1106: Fix #67626
| | | | * | Fix #67626Julien Pauli2015-02-201-1/+11
| | | | | |
| | | * | | 5.5.24 nowJulien Pauli2015-03-051-3/+3
| | | | | |
| | * | | | Fix #67626Julien Pauli2015-03-081-1/+11
| | | | | |
| * | | | | Fix for #66048Julien Pauli2015-05-124-39/+40
| | | | | |
| * | | | | HTTP 506 status code added.Adil Ilhan2015-05-121-0/+1
| | | | | | | | | | | | | | | | | | HTTP 506 status code added in main http status codes file. Reference: RFC 2295
* | | | | | Use logger pointerXinchen Hui2015-05-192-7/+22
| | | | | |
* | | | | | Move fastcgi.c to mainXinchen Hui2015-05-192-0/+1715
|/ / / / /
* | | | | Clean up some type conversionsNikita Popov2015-04-271-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | While at it also fix some type checks in iconv and drop dead and unported code in standard/filters.
* | | | | Fix undeclared identifier 'PHP_STREAM_KEEP_RSRC'Di Wu2015-04-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Identifier named `PHP_STREAM_FREE_KEEP_RSRC` but use `PHP_STREAM_KEEP_RSRC` Reference Line 131
* | | | | Fixed bug #68887 (resources are not freed correctly)Dmitry Stogov2015-04-083-10/+6
| | | | |
* | | | | CleanupDmitry Stogov2015-04-071-16/+4
| | | | |
* | | | | Fix buildKalle Sommer Nielsen2015-04-041-1/+1
| | | | |
View Lorry Controller Status