Commit Graph

891 Commits

Author SHA1 Message Date
ALeX Kazik
475a644bd8 Implemented Feature #60524 (sys_temp_dir)
Added a new configuration directive which allows it to change the
temporary directory, the default behavior is unchanged.

This is a useful option if you use all/some hosts inside of one .ini file
with sections and want to change the temp dir per user (maybe it's not
allowed to write outside the users home directory). Since the TMPDIR
variable affects the whole php that way can not be used for this scenario.

(see https://bugs.php.net/bug.php?id=60524)
2013-01-28 22:37:43 -08:00
Stanislav Malyshev
80a9a80a52 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Bug #43177: If an eval() has a parse error, the overall exit status and return code should not be affected.
  fix NEWS

Conflicts:
	main/main.c
2013-01-01 21:20:35 -08:00
Stanislav Malyshev
36e19c9cab Bug #43177: If an eval() has a parse error, the overall exit status and return code should not be affected.
Without this fix, a webpage using eval() may return code 500.  That might display
fine and the 500 go unnoticed, but using AJAX or wget, the 500 will cause problems.
2013-01-01 21:18:59 -08:00
Xinchen Hui
a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
Xinchen Hui
0a7395e009 Happy New Year 2013-01-01 16:28:54 +08:00
Xinchen Hui
8fcb4f1107 Merge branch 'PHP-5.4' 2012-09-23 23:00:15 +08:00
Xinchen Hui
395d77c540 Fixed bug #60723 (error_log error time has changed to UTC ignoring default timezo) 2012-09-23 22:59:31 +08:00
Rasmus Lerdorf
fa5477d9d4 Fix folding 2012-09-20 14:24:55 -04:00
Rasmus Lerdorf
2322be0fab Fix folding 2012-09-20 14:22:15 -04:00
Andrew Faulds
d12f8d6790 Removed Logo GUIDs and replaced with Data URIs and div hidden with JS
- removed php_logo_guid()
- removed php_egg_logo_guid()
- removed php_real_logo_guid()
- removed zend_logo_guid()
- removed logo GUID handling
- removed logo GUIDs from source
- added logo data URIs instead for phpinfo()
- added credits to phpinfo() page, but hidden by default
2012-07-14 21:44:21 +01:00
Stanislav Malyshev
2065bab102 Merge branch 'PHP-5.4'
* PHP-5.4:
  typo fix
2012-06-10 20:38:58 -07:00
Stanislav Malyshev
b55e69285b typo fix 2012-06-10 20:38:22 -07:00
Xinchen Hui
579d234f50 Merge branch 'PHP-5.4' 2012-04-15 01:17:56 +08:00
Xinchen Hui
3b42f184cd Fixed bug #61728 (php-fpm SIGSEGV running friendica on nginx) 2012-04-15 01:16:34 +08:00
Rasmus Lerdorf
02f6937073 Merge: make max_file_uploads PHP_INI_SYSTEM|PHP_INI_PERDIR 2012-03-01 22:49:03 +00:00
Rasmus Lerdorf
8bc24c0046 I think we should let this be settable from .htaccess to match the other post/upload
related limits like upload_max_filesize, post_max_size, and max_input_vars.
2012-02-17 17:54:11 +00:00
Stanislav Malyshev
dab17da38a make ZEND_SIGNALS configurable, off by default
also make ZEND_SIGNALS enabled and disabled binary-compatible
2012-02-16 01:51:45 +00:00
Stanislav Malyshev
fa9540e1f1 make ZEND_SIGNALS configurable, off by default
also make ZEND_SIGNALS enabled and disabled binary-compatible
2012-02-16 01:51:45 +00:00
Michael Wallner
c64a69c8b8 MFH: r322963
fix headers print to stdout/stderr if no output written; 
fix crashes and invalid usage of output control in cli server while passing by
2012-01-31 09:58:26 +00:00
Michael Wallner
29c8658dc8 fix headers print to stdout/stderr if no output written; need to make some more testsbefore committing to PHP_5_4; fix crashes and invalid usage of output control in cli server while passing by 2012-01-31 08:51:24 +00:00
Dmitry Stogov
d940f2d38a Fixed workaround for bug #48034 on Windows (Crash when script is 8192 (8KB) bytes long) 2012-01-17 09:30:12 +00:00
Dmitry Stogov
9025d6219d Fixed workaround for bug #48034 on Windows (Crash when script is 8192 (8KB) bytes long) 2012-01-17 09:30:12 +00:00
Felipe Pena
8775a37559 - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Dmitry Stogov
6fb3897f80 Added max_input_vars directive to prevent attacks based on hash collisions 2011-12-14 08:56:35 +00:00
Dmitry Stogov
4ffedc700d Added max_input_vars directive to prevent attacks based on hash collisions 2011-12-14 08:56:35 +00:00
Xinchen Hui
b5766cdcac Implemented FR #54514 (Get php binary path during script execution). 2011-12-07 10:33:13 +00:00
Xinchen Hui
5aa1fb6074 Implemented FR #54514 (Get php binary path during script execution). 2011-12-07 10:33:13 +00:00
Derick Rethans
9e6bf9f3f4 - Fixed bug #60373 (Startup errors with log_errors on cause segfault). 2011-11-25 14:06:55 +00:00
Derick Rethans
0244e76c06 - Fixed bug #60373 (Startup errors with log_errors on cause segfault). 2011-11-25 14:06:55 +00:00
Pierre Joye
36e4c600c3 - merge crt warning change (r216594) and rename the ini to windows.show_crt_warning 2011-11-24 12:46:45 +00:00
Pierre Joye
89193ecf61 - merge crt warning change (r216594) and rename the ini to windows.show_crt_warning 2011-11-24 12:46:45 +00:00
Xinchen Hui
1f78177e2b Fixed bug #60038 (SIGALRM cause segfault in php_error_cb) 2011-10-16 03:00:51 +00:00
Xinchen Hui
077519d3fb Fixed bug #60038 (SIGALRM cause segfault in php_error_cb) 2011-10-16 03:00:51 +00:00
Xinchen Hui
c5ac13f632 Merge r316812 to trunk 2011-10-16 01:19:55 +00:00
Dmitry Stogov
a223328b52 Fixed bug #50982 (incorrect assumption of PAGE_SIZE size) 2011-09-15 11:30:17 +00:00
Dmitry Stogov
4a25a7740d Fixed ZE specific compile warnings (Bug #55629) 2011-09-13 13:29:35 +00:00
Dmitry Stogov
e43ff1359e Fixed ZE specific compile warnings (Bug #55629) 2011-09-13 13:29:35 +00:00
Pierre Joye
5a49af4253 - do not display the crt warnings anymore by default. It is enough to simply fail from a user land pov as it is the case on posix platforms 2011-09-13 10:38:12 +00:00
Pierre Joye
c1db9d4a87 - do not display the crt warnings anymore by default. It is enough to simply fail from a user land pov as it is the case on posix platforms 2011-09-13 10:38:12 +00:00
Derick Rethans
840ef1e320 - Turn on html_errors by default again in php.ini-production like it was in
PHP 5.3, but only generate docref links when the docref_root INI setting is
  not empty.
2011-08-10 16:31:29 +00:00
Derick Rethans
7b84e7ea1c - Turn on html_errors by default again in php.ini-production like it was in
PHP 5.3, but only generate docref links when the docref_root INI setting is
  not empty.
2011-08-10 16:31:29 +00:00
Pierre Joye
9805e1674a - remove magic quotes support, functions are kept (see the NEWS entry for the details) for BC reasons but do not allow to set enable MQ 2011-07-22 11:25:30 +00:00
Pierre Joye
cc1c7af037 - remove magic quotes support, functions are kept (see the NEWS entry for the details) for BC reasons but do not allow to set enable MQ 2011-07-22 11:25:30 +00:00
Derick Rethans
29565d1a4c - Added a new PHPAPI function to return module_initialized:
php_get_module_initialized().
2011-06-24 11:19:34 +00:00
Derick Rethans
09607226d4 - Added a new PHPAPI function to return module_initialized:
php_get_module_initialized().
2011-06-24 11:19:34 +00:00
Felipe Pena
72f7be3df0 - Improved parse error messages 2011-06-23 23:00:53 +00:00
Felipe Pena
0372e6ad80 - Improved parse error messages 2011-06-23 23:00:53 +00:00
Ilia Alshanetsky
34d93f0c06 Zend Signal Handling 2011-06-22 14:23:21 +00:00
Pierre Joye
a8068a676b - fix build 2011-06-18 02:24:01 +00:00