summaryrefslogtreecommitdiff
path: root/main/main.c
Commit message (Expand)AuthorAgeFilesLines
* Remove unneeded string copy.Yasuo Ohgaki2014-03-271-6/+6
* Implement RFC https://wiki.php.net/rfc/default_encodingYasuo Ohgaki2014-02-131-2/+44
* Bump yearXinchen Hui2014-01-031-1/+1
* add 'never'Michael Wallner2013-12-301-0/+3
* s/BOOLEAN/ENTRY/Michael Wallner2013-12-301-1/+1
* re-introduce always_populate_raw_post_dataMichael Wallner2013-12-301-0/+32
* Merge branch 'PHP-5.5' into PHP-5.6Sara Golemon2013-12-031-1/+18
|\
| * Fix php_module_startup() when loading more than one additional moduleSara Golemon2013-12-031-1/+18
| * Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-08-181-1/+6
| |\
| | * Fixed #65225: PHP_BINARY incorrectly setPatrick Allaert2013-08-181-1/+6
* | | back to do_alloca()Anatol Belski2013-10-311-3/+4
* | | back to do_alloca(), reverted the wrong replacementAnatol Belski2013-10-301-2/+3
* | | applied and fixed the original patchAnatol Belski2013-10-171-8/+8
* | | Merge branch 'slim-postdata'Michael Wallner2013-09-171-1/+0
|\ \ \
| * | | slim post dataMichael Wallner2013-08-271-1/+0
* | | | Merge branch 'pull-request/381'Stanislav Malyshev2013-08-181-1/+6
|\ \ \ \
| * | | | Fixed #65225: PHP_BINARY incorrectly setPatrick Allaert2013-07-091-1/+6
| |/ / /
* | | | Merge branch 'PHP-5.5'Xinchen Hui2013-08-141-2/+2
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-08-141-2/+2
| |\ \ | | |/
| | * Fixed #65431 (Discarded qualifiers from pointer target warnings when using --...Xinchen Hui2013-08-141-2/+2
* | | Merge branch 'PHP-5.5'Felipe Pena2013-06-251-0/+3
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.4' into PHP-5.5Felipe Pena2013-06-251-0/+3
| |\ \ | | |/
| | * - Fixed bug #60732 (php_error_docref links to invalid pages) patch by: Jakub ...Felipe Pena2013-06-251-0/+3
* | | Merge branch 'PHP-5.5'Anatol Belski2013-05-161-0/+2
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2013-05-161-0/+2
| |\ \ | | |/
| | * Fixed bug #64853Use of no longer available ini directives causes crash on TS ...Anatol Belski2013-05-161-0/+2
| | * Fixed bugs #47675 and #64577 (fd leak on Solaris)Rasmus Lerdorf2013-04-041-2/+2
| * | Fixed bugs #47675 and #64577 (fd leak on Solaris)Rasmus Lerdorf2013-04-041-2/+2
* | | Fixed bugs #47675 and #64577 (fd leak on Solaris)Rasmus Lerdorf2013-04-041-2/+2
* | | Fix a couple typosCarson McDonald2013-03-031-2/+2
|/ /
* | Implemented Feature #60524 (sys_temp_dir)ALeX Kazik2013-01-281-0/+1
* | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-01-011-34/+44
|\ \ | |/
| * Bug #43177: If an eval() has a parse error, the overall exit status and retur...Stanislav Malyshev2013-01-011-35/+45
| * Happy New YearXinchen Hui2013-01-011-1/+1
* | Happy New YearXinchen Hui2013-01-011-1/+1
* | Merge branch 'PHP-5.4'Xinchen Hui2012-09-231-1/+9
|\ \ | |/
| * Fixed bug #60723 (error_log error time has changed to UTC ignoring default ti...Xinchen Hui2012-09-231-1/+9
| * Fix foldingRasmus Lerdorf2012-09-201-0/+1
* | Fix foldingRasmus Lerdorf2012-09-201-0/+1
* | Removed Logo GUIDs and replaced with Data URIs and div hidden with JSAndrew Faulds2012-07-141-14/+0
* | Merge branch 'PHP-5.4'Stanislav Malyshev2012-06-101-1/+1
|\ \ | |/
| * typo fixStanislav Malyshev2012-06-101-1/+1
* | Merge branch 'PHP-5.4'Xinchen Hui2012-04-151-7/+7
|\ \ | |/
| * Fixed bug #61728 (php-fpm SIGSEGV running friendica on nginx)Xinchen Hui2012-04-151-7/+7
| * Merge: make max_file_uploads PHP_INI_SYSTEM|PHP_INI_PERDIRRasmus Lerdorf2012-03-011-1/+1
| * make ZEND_SIGNALS configurable, off by defaultStanislav Malyshev2012-02-161-2/+0
| * MFH: r322963Michael Wallner2012-01-311-3/+2
| * Fixed workaround for bug #48034 on Windows (Crash when script is 8192 (8KB) b...Dmitry Stogov2012-01-171-3/+3
| * - Year++Felipe Pena2012-01-011-1/+1
| * Added max_input_vars directive to prevent attacks based on hash collisionsDmitry Stogov2011-12-141-0/+1