diff options
| author | Remi Collet <fedora@famillecollet.com> | 2015-04-22 10:09:25 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2015-04-22 10:09:25 +0200 |
| commit | 10d4f4df1c2608a6d9366d65f5ddd77578ee1dad (patch) | |
| tree | 0ad2a9ffea47316fb1bb8bdf11b07046492d96e5 /xdebug-pr172.patch | |
| parent | 93cfd4711db90e43473a6d358167dbf36663f35c (diff) | |
php-pecl-xdebug: add patch for virtual_file_ex in 5.6 #1214111
Diffstat (limited to 'xdebug-pr172.patch')
| -rw-r--r-- | xdebug-pr172.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/xdebug-pr172.patch b/xdebug-pr172.patch new file mode 100644 index 0000000..e262339 --- /dev/null +++ b/xdebug-pr172.patch @@ -0,0 +1,37 @@ +From 419834a441cc65bb4e7220e1128356dc99d86211 Mon Sep 17 00:00:00 2001 +From: Remi Collet <fedora@famillecollet.com> +Date: Wed, 22 Apr 2015 08:49:51 +0200 +Subject: [PATCH] fix usage of virtual_file_ex + +--- + usefulstuff.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/usefulstuff.c b/usefulstuff.c +index 83725c7..3bc4d1a 100644 +--- a/usefulstuff.c ++++ b/usefulstuff.c +@@ -344,7 +344,11 @@ char *xdebug_path_to_url(const char *fileurl TSRMLS_DC) + cwd[0] = '\0'; + } + ++#if PHP_VERSION_ID < 50600 + new_state.cwd = strdup(cwd); ++#else ++ new_state.cwd = estrdup(cwd); ++#endif + new_state.cwd_length = strlen(cwd); + + if (!virtual_file_ex(&new_state, fileurl, NULL, 1 TSRMLS_CC)) { +@@ -352,7 +356,11 @@ char *xdebug_path_to_url(const char *fileurl TSRMLS_DC) + tmp = xdebug_sprintf("file://%s",s); + efree(s); + } ++#if PHP_VERSION_ID < 50600 + free(new_state.cwd); ++#else ++ efree(new_state.cwd); ++#endif + + } else if (fileurl[1] == '/' || fileurl[1] == '\\') { + /* convert UNC paths (eg. \\server\sharepath) */ |