diff options
| author | Christopher Jones <sixd@php.net> | 2012-10-08 16:13:07 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2012-10-08 16:13:07 -0700 |
| commit | 91169fb24fa2c63d6cbab226a02d5fef277ea11b (patch) | |
| tree | 8d088abd1cfaf881697f87b59e230ddbf3863b7f /ext/gd/gd.c | |
| parent | f0c65bc0e3bb4565101a9dadb8fb01ef2a760d49 (diff) | |
| parent | 67611c67fa5a3b2c199d41ef7df3307308c56faa (diff) | |
| download | php-git-91169fb24fa2c63d6cbab226a02d5fef277ea11b.tar.gz | |
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
* 'PHP-5.4' of https://git.php.net/repository/php-src: (45 commits)
Fixed bug #63219 (Segfault when aliasing trait method when autoloader throws excpetion)
exposing the libxpm version in phpinfo
5.4.9-dev
PHP-5.3 branch is 5.3.19 now
reverted the previous fix for libpng include
fixed include checks for libpng under win
Avoding superfluous function call
Add test for #35895
Now we can set the tsrm_ls manually
Fixed bug #63184 test (ext/spl/tests/RecursiveDirectoryIterator_getSubPathname_basic.phpt failed)
add news for --offline
add --offline option to run-tests command
Bug #63147: SKIP_ONLINE_TESTS, for getmxrr
Bug #63147: introduce SKIP_ONLINE_TESTS, for gethostbyname
gethostbyname_basic002.phpt is a duplicate to gethostbyname_error004.phpt
add bug #63162
fix test and move to proper place
synergy ftl. Removed duplicate fields.
adding test phpt
Bug #63162 - parse_url does not matches password component
...
Diffstat (limited to 'ext/gd/gd.c')
| -rw-r--r-- | ext/gd/gd.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ext/gd/gd.c b/ext/gd/gd.c index 8fa0adec92..cfcc3e876c 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -1328,6 +1328,11 @@ PHP_MINFO_FUNCTION(gd) #endif #if defined(HAVE_GD_XPM) && defined(HAVE_GD_BUNDLED) php_info_print_table_row(2, "XPM Support", "enabled"); + { + char tmp[12]; + snprintf(tmp, sizeof(tmp), "%d", XpmLibraryVersion()); + php_info_print_table_row(2, "libXpm Version", tmp); + } #endif #ifdef HAVE_GD_XBM php_info_print_table_row(2, "XBM Support", "enabled"); |