com php-src: Fix bug #72996: NEWS sapi/phpdbg/phpdbg_prompt .c
| From: | Nikita Popov | Date: | Sat, 03 Sep 2016 21:30:23 +0000 |
| Subject: | com php-src: Fix bug #72996: NEWS sapi/phpdbg/phpdbg_prompt .c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-94285@lists.php.net to get a copy of this message | ||
Commit: 1ae2d074f8fdb7558c404b2deb20b4a31e592058
Author: Nikita Popov <nikic@php.net> Sat, 3 Sep 2016 23:30:23 +0200
Parents: 8cc9570f53926df12e85302af325d42382326bf4
Branches: PHP-7.0 PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1ae2d074f8fdb7558c404b2deb20b4a31e592058
Log:
Fix bug #72996
Bugs:
https://bugs.php.net/72996
Changed paths:
M NEWS
M sapi/phpdbg/phpdbg_prompt.c
Diff:
diff --git a/NEWS b/NEWS
index c26aa34..c38ed5d 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,9 @@ PHP NEWS
. Fixed bug #72982 (Memory leak in zend_accel_blacklist_update_regexp()
function). (Laruence)
+- phpdbg:
+ . Fixed bug #72996 (phpdbg_prompt.c undefined reference to DL_LOAD). (Nikita)
+
- SOAP:
. Fixed bug #71711 (Soap Server Member variables reference bug). (Nikita)
. Fixed bug #71996 (Using references in arrays doesn't work like expected)..
diff --git a/sapi/phpdbg/phpdbg_prompt.c b/sapi/phpdbg/phpdbg_prompt.c
index 6f73d30..7115d8d 100644
--- a/sapi/phpdbg/phpdbg_prompt.c
+++ b/sapi/phpdbg/phpdbg_prompt.c
@@ -1019,6 +1019,7 @@ static int add_zendext_info(zend_extension *ext) /* {{{ */ {
}
/* }}} */
+#ifdef HAVE_LIBDL
PHPDBG_API const char *phpdbg_load_module_or_extension(char **path, char **name) /* {{{ */ {
DL_HANDLE handle;
char *extension_dir;
@@ -1159,6 +1160,7 @@ quit:
return NULL;
}
/* }}} */
+#endif
PHPDBG_COMMAND(dl) /* {{{ */
{