Changeset 319936f in git

Timestamp:

2013-09-21T03:48:47Z (6 years ago)

Author:

Xuefer <xuefer@…>

Branches:

3.0

Children:

2827460

Parents:

f19bd50

Message:

merge build fix from trunk

git-svn-id: ​svn://svn.lighttpd.net/xcache/branches/3.0@1376 c26eb9a1-5813-0410-bd6c-c2e55f420ca7

File:

• mod_cacher/xc_cacher.c (modified) (3 diffs)

mod_cacher/xc_cacher.c

@@ -1019 +1019 @@
         wrapper = php_stream_locate_url_wrapper(filepath, &path_for_open, 0 TSRMLS_CC); 
         if (wrapper && wrapper->wops->url_stat
-         && wrapper != &php_plain_files_wrapper
-         && wrapper->wops->url_stat(wrapper, path_for_open, PHP_STREAM_URL_STAT_QUIET, &ssb, NULL TSRMLS_CC) == SUCCESS) {
+#ifdef ZEND_ENGINE_2
+         && wrapper->wops->url_stat(wrapper, path_for_open, PHP_STREAM_URL_STAT_QUIET, &ssb, NULL TSRMLS_CC) == SUCCESS
+#else
+         && wrapper->wops->url_stat(wrapper, path_for_open, &ssb TSRMLS_CC) == SUCCESS
+#endif
+        ) {
             *statbuf = ssb.sb;
             return SUCCESS;
@@ -2179 +2183 @@
      || !h->filename
      || !SG(request_info).path_translated
-
     ) {
         TRACE("%s", "cacher not enabled");
@@ -2268 +2271 @@
 {
     xc_gc_op_array_t *op_array = (xc_gc_op_array_t *) pDest;
-    zend_uint i;
 #ifdef ZEND_ENGINE_2
     if (op_array->arg_info) {
+        zend_uint i;
         for (i = 0; i < op_array->num_args; i++) {
             efree((char *) ZSTR_V(op_array->arg_info[i].name));