Attachment 138078 Details for Bug 183922 – pecl-xhprof-0.9.4.patch

[patch] pecl-xhprof-0.9.4.patch

pecl-xhprof-0.9.4.patch (text/plain), 3.98 KB, created by Hung-Yi Chen on 2013-11-13 10:50:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hung-Yi Chen

Created: 2013-11-13 10:50:01 UTC

Size: 3.98 KB

patch

obsolete

>diff -ruN /usr/ports/devel/pecl-xhprof/Makefile ./Makefile
>--- /usr/ports/devel/pecl-xhprof/Makefile	2013-09-21 01:13:42.000000000 +0800
>+++ ./Makefile	2013-11-13 18:40:35.000000000 +0800
>@@ -2,8 +2,7 @@
> # $FreeBSD: devel/pecl-xhprof/Makefile 327724 2013-09-20 17:13:42Z bapt $
> 
> PORTNAME=	xhprof
>-PORTVERSION=	0.9.2
>-PORTREVISION=	1
>+PORTVERSION=	0.9.4
> CATEGORIES=	devel pear
> MASTER_SITES=	http://pecl.php.net/get/
> PKGNAMEPREFIX=	pecl-
>diff -ruN /usr/ports/devel/pecl-xhprof/distinfo ./distinfo
>--- /usr/ports/devel/pecl-xhprof/distinfo	2012-07-14 21:54:48.000000000 +0800
>+++ ./distinfo	2013-11-13 18:40:45.000000000 +0800
>@@ -1,2 +1,2 @@
>-SHA256 (xhprof-0.9.2.tgz) = 5359ea0a1e16ec6c100dd7adb7285bdcc0f931e0b61631ea364f8b06925ea729
>-SIZE (xhprof-0.9.2.tgz) = 931660
>+SHA256 (xhprof-0.9.4.tgz) = 002a2d4a825d16aeb3017c59f94d8c5e5d06611dd6197acd2f07fce197d3b8f8
>+SIZE (xhprof-0.9.4.tgz) = 842077
>diff -ruN /usr/ports/devel/pecl-xhprof/files/patch-extension_xhprof.c ./files/patch-extension_xhprof.c
>--- /usr/ports/devel/pecl-xhprof/files/patch-extension_xhprof.c	1970-01-01 08:00:00.000000000 +0800
>+++ ./files/patch-extension_xhprof.c	2013-11-13 18:44:31.000000000 +0800
>@@ -0,0 +1,11 @@
>+--- xhprof.c.orig	2013-11-13 18:41:35.000000000 +0800
>++++ xhprof.c	2013-11-13 18:43:37.000000000 +0800
>+@@ -28,7 +28,7 @@
>+ #include "php_ini.h"
>+ #include "ext/standard/info.h"
>+ #include "php_xhprof.h"
>+-#include "zend_extensions.h"
>++#include "Zend/zend_extensions.h"
>+ #include <sys/time.h>
>+ #include <sys/resource.h>
>+ #include <stdlib.h>
>diff -ruN /usr/ports/devel/pecl-xhprof/files/patch-xhprof.c ./files/patch-xhprof.c
>--- /usr/ports/devel/pecl-xhprof/files/patch-xhprof.c	2012-07-14 21:54:48.000000000 +0800
>+++ ./files/patch-xhprof.c	1970-01-01 08:00:00.000000000 +0800
>@@ -1,56 +0,0 @@
>---- xhprof.c
>-+++ xhprof.c
>-@@ -28,6 +28,7 @@
>- #include "php_ini.h"
>- #include "ext/standard/info.h"
>- #include "php_xhprof.h"
>-+#include "Zend/zend_extensions.h"
>- #include <sys/time.h>
>- #include <sys/resource.h>
>- #include <stdlib.h>
>-@@ -898,7 +899,7 @@ static char *hp_get_base_filename(char *filename) {
>- static char *hp_get_function_name(zend_op_array *ops TSRMLS_DC) {
>-   zend_execute_data *data;
>-   char              *func = NULL;
>--  char              *cls = NULL;
>-+  const char        *cls = NULL;
>-   char              *ret = NULL;
>-   int                len;
>-   zend_function      *curr_func;
>-@@ -942,7 +943,12 @@ static char *hp_get_function_name(zend_op_array *ops TSRMLS_DC) {
>-       /* we are dealing with a special directive/function like
>-        * include, eval, etc.
>-        */
>-+#if ZEND_EXTENSION_API_NO >= 220100525
>-+      curr_op = data->opline->extended_value;
>-+#else
>-       curr_op = data->opline->op2.u.constant.value.lval;
>-+#endif
>-+
>-       switch (curr_op) {
>-         case ZEND_EVAL:
>-           func = "eval";
>-@@ -1660,13 +1666,22 @@ ZEND_DLEXPORT void hp_execute_internal(zend_execute_data *execute_data,
>-   if (!_zend_execute_internal) {
>-     /* no old override to begin with. so invoke the builtin's implementation  */
>-     zend_op *opline = EX(opline);
>-+#if ZEND_EXTENSION_API_NO >= 220100525
>-+    temp_variable *retvar = &EX_T(opline->result.var);
>-+    ((zend_internal_function *) EX(function_state).function)->handler(
>-+                       opline->extended_value,
>-+                       retvar->var.ptr,
>-+                       (EX(function_state).function->common.fn_flags & ZEND_ACC_RETURN_REFERENCE) ?
>-+                       &retvar->var.ptr:NULL,
>-+                       EX(object), ret TSRMLS_CC);
>-+#else
>-     ((zend_internal_function *) EX(function_state).function)->handler(
>-                        opline->extended_value,
>-                        EX_T(opline->result.u.var).var.ptr,
>-                        EX(function_state).function->common.return_reference ?
>-                        &EX_T(opline->result.u.var).var.ptr:NULL,
>-                        EX(object), ret TSRMLS_CC);
>--
>-+#endif
>-   } else {
>-     /* call the old override */
>-     _zend_execute_internal(execute_data, ret TSRMLS_CC);

Actions: View | Diff

Attachments on bug 183922: 138078