49493a2dcf
Happy new year (Update copyright to 2016)
2016-01-01 19:21:47 +02:00
657f93e7b9
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated NEWS
fixes bug #69835 : phpinfo() does not report many Windows SKUs
2015-06-18 22:03:28 +02:00
a85156db7d
fixes bug #69835 : phpinfo() does not report many Windows SKUs
2015-06-18 22:01:20 +02:00
64df05d5b1
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated NEWS
Fix #69781 : phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business"
Revert "Fix #69781 : phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business""
Fix #69781 : phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business"
2015-06-10 11:25:21 +02:00
0c8136654d
Fix #69781 : phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business"
2015-06-10 11:22:30 +02:00
82e5260104
Revert "Fix #69781 : phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business""
...
This reverts commit 4a05c81b85
2015-06-10 11:22:29 +02:00
741b949a6f
Fix #69781 : phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business"
2015-06-10 11:22:28 +02:00
021effbe97
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
backport the basic code to properly recognize win 8.1 and 10
backport the manifest changes for makefile
backport the manifest changes in js
add default manifest
add test
2015-05-31 19:32:21 +02:00
1e9522021a
backport the basic code to properly recognize win 8.1 and 10
2015-05-31 19:01:58 +02:00
0579e8278d
bump year
2015-01-15 23:26:37 +08:00
73c1be2653
Bump year
2015-01-15 23:26:03 +08:00
3dc9bef819
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
ext/fileinfo/data_file.c
ext/fileinfo/libmagic/softmagic.c
ext/fileinfo/magicdata.patch
2014-08-06 16:25:12 +03:00
41e1ccefd5
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
NEWS
configure.in
main/php_version.h
2014-08-06 15:27:56 +03:00
ae74549239
backport the fix for bug #67739
2014-08-04 09:57:08 +02:00
8b3cc726be
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Backported the patch from bug #67407 into 5.5+
Backported the patch from bug #67407 into 5.4
NEWS
NEWS
Fix Bug #67530 error_log=syslog ignored
Conflicts:
sapi/fpm/fpm/fpm_stdio.c
2014-07-08 09:57:36 +02:00
51f79846bf
Backported the patch from bug #67407 into 5.5+
2014-07-08 09:54:36 +02:00
03214a2aef
Backported the patch from bug #67407 into 5.4
2014-07-08 09:52:35 +02:00
84f9fe0fdc
Fix bug #67498 - phpinfo() Type Confusion Information Leak Vulnerability
2014-06-24 10:29:26 -07:00
e2ed4874b5
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
5.4.30
Better fix for bug #67072 with more BC provisions
Fix bug #67498 - phpinfo() Type Confusion Information Leak Vulnerability
update CVE
Fix bug #67492 : unserialize() SPL ArrayObject / SPLObjectStorage Type Confusion
Fix bug #67397 (Buffer overflow in locale_get_display_name->uloc_getDisplayName (libicu 4.8.1))
Fix bug #67349 : Locale::parseLocale Double Free
add CVEs
Fix potential segfault in dns_get_record()
Fix bug #66127 (Segmentation fault with ArrayObject unset)
5.4.30 rc1
Conflicts:
ext/intl/locale/locale_methods.c
2014-06-24 10:25:09 -07:00
fb0128af2a
Fix bug #67498 - phpinfo() Type Confusion Information Leak Vulnerability
2014-06-23 00:22:59 -07:00
4e2ae5f5ca
Here need to be str_efree
...
found by ext/standard/tests/general_functions/phpinfo2.php fails
2014-01-03 11:36:50 +08:00
c081ce628f
Bump year
2014-01-03 11:08:10 +08:00
47c9027772
Bump year
2014-01-03 11:06:16 +08:00
c0d060f5c0
Bump year
2014-01-03 11:04:26 +08:00
4abee3730f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix pointer sign warning showing up in EVERY build
2013-08-21 19:18:29 +02:00
6181948592
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix pointer sign warning showing up in EVERY build
2013-08-21 19:18:11 +02:00
d8023d13eb
Fix pointer sign warning showing up in EVERY build
2013-08-21 19:17:22 +02:00
46cc826770
Merge branch 'pull-request/231'
...
* pull-request/231:
update Zend Engine logo as per Zeev, and tweak PHP logos ... :)
fix for scrolling, other minor tweaks
Bump up table width a bit more and make columns consistent
Bringing CSS up to this decade's standards.
2013-07-21 22:49:26 -07:00
adb116dd48
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com
- BFN
2013-06-25 18:00:42 -03:00
41b73e4cee
- Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com
2013-06-25 18:00:33 -03:00
f01a7e54d3
add windows 8 and windows server 2012
2013-03-27 07:29:47 +01:00
a666285bc2
Happy New Year
2013-01-01 16:37:09 +08:00
0a7395e009
Happy New Year
2013-01-01 16:28:54 +08:00
6eb0aa9794
fix for scrolling, other minor tweaks
2012-12-04 09:37:10 -06:00
ff93287fff
Bringing CSS up to this decade's standards.
...
Here are some tweaks to the phpinfo() styling, since this really hasn't
been touched in almost a decade:
- color codes are shortened
- table width is bigger and handled via CSS
- fix so that long INI entries don't make the layout super wide
- bgcolor for "Additional Modules" wasn't set
- fix my email address
Signed-off-by: Colin Viebrock <colin@viebrock.ca >
2012-11-08 12:08:45 -06:00
3d4169d751
Fix phpcredits() BC after remove Logo GUIDs
...
This test was affected: ext/standard/tests/general_functions/phpcredits2.phpt
see https://github.com/php/php-src/pull/132/files#diff-3
This makes constant PHP_CREDITS_FULLPAGE didn't functional anymore.
2012-08-09 21:43:59 +08:00
c9eb64127e
Merge branch 'pull-request/132'
...
* pull-request/132:
OK, bye bye JavaScript, let's just include credits before license
Nicer (JSLint-compliant!) credits reveal JavaScript
Removed now-unnecessary expose_php checks for logo
Fixed small misalignment in prev commit
Removed Logo GUIDs and replaced with Data URIs and div hidden with JS
2012-08-05 21:15:53 -07:00
b1a997e2a2
OK, bye bye JavaScript, let's just include credits before license
2012-07-23 00:11:00 +01:00
c7c2fb0158
Nicer (JSLint-compliant!) credits reveal JavaScript
2012-07-15 14:41:53 +01:00
ee6540ad09
Removed now-unnecessary expose_php checks for logo
2012-07-14 23:20:45 +01:00
92d2aeb234
Fixed small misalignment in prev commit
2012-07-14 21:55:11 +01:00
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
6655f79401
Fix bug #61409 (Bad formatting on phpinfo()). Patch by Jakub Vrana.
2012-03-16 02:07:46 +00:00
9aec9ccd7c
Fix bug #61409 (Bad formatting on phpinfo()). Patch by Jakub Vrana.
2012-03-16 02:07:46 +00:00
8775a37559
- Year++
2012-01-01 13:15:04 +00:00
4e19825281
- Year++
2012-01-01 13:15:04 +00:00
5f429c57e9
- Fixed bug #52461 (Incomplete doctype and missing xmlns)
2011-08-19 09:59:47 +00:00
15c1a73678
- Fixed bug #52461 (Incomplete doctype and missing xmlns)
2011-08-19 09:59:47 +00:00
a7852bcb00
Make codes more clearly, and make the static analyzer silent..
2011-08-08 06:49:17 +00:00
caedca8dd0
Make codes more clearly, and make the static analyzer silent..
2011-08-08 06:49:17 +00:00
Lior Kaplan