diff options
| author | ale <ale@FreeBSD.org> | 2006-11-22 14:51:32 +0800 |
|---|---|---|
| committer | ale <ale@FreeBSD.org> | 2006-11-22 14:51:32 +0800 |
| commit | ef8db3e965a957c3e5b00410ecb98a93d35b951e (patch) | |
| tree | 4deac3a4b29c182778a7976b2622292859f337a4 /www | |
| parent | 6c613f01d029b1dc186b639fb77125ae2f0df564 (diff) | |
| download | freebsd-ports-gnome-ef8db3e965a957c3e5b00410ecb98a93d35b951e.tar.gz freebsd-ports-gnome-ef8db3e965a957c3e5b00410ecb98a93d35b951e.tar.zst freebsd-ports-gnome-ef8db3e965a957c3e5b00410ecb98a93d35b951e.zip | |
Add a few fixes from trunk.
Diffstat (limited to 'www')
| -rw-r--r-- | www/xcache/Makefile | 1 | ||||
| -rw-r--r-- | www/xcache/files/patch-lock.c | 16 | ||||
| -rw-r--r-- | www/xcache/files/patch-xcache.c | 41 |
3 files changed, 58 insertions, 0 deletions
diff --git a/www/xcache/Makefile b/www/xcache/Makefile index b6b303922031..d8a4d1eb9dd7 100644 --- a/www/xcache/Makefile +++ b/www/xcache/Makefile @@ -7,6 +7,7 @@ PORTNAME= xcache DISTVERSION= 1.2-beta3 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://210.51.190.228/pub/XCache/Releases/ \ http://210.51.190.228/pub/XCache/snapshots/ diff --git a/www/xcache/files/patch-lock.c b/www/xcache/files/patch-lock.c new file mode 100644 index 000000000000..cce912f40c7b --- /dev/null +++ b/www/xcache/files/patch-lock.c @@ -0,0 +1,16 @@ +--- lock.c (revision 62) ++++ lock.c (revision 282) +@@ -92,5 +92,5 @@ + } + size = strlen(tmpdir) + sizeof("/.xcache.lock") - 1 + 3 * 10 + 100; +- myname = do_alloca(size); ++ myname = malloc(size); + snprintf(myname, size - 1, "%s%c.xcache.%d.%d.%d.lock", tmpdir, DEFAULT_SLASH, (int) getuid(), i ++, rand()); + pathname = myname; +@@ -119,5 +119,5 @@ + + if (myname) { +- free_alloca(myname); ++ free(myname); + } + diff --git a/www/xcache/files/patch-xcache.c b/www/xcache/files/patch-xcache.c new file mode 100644 index 000000000000..a5aa3c826f36 --- /dev/null +++ b/www/xcache/files/patch-xcache.c @@ -0,0 +1,41 @@ +--- xcache.c (revision 278) ++++ xcache.c (revision 283) +@@ -1582,10 +1582,9 @@ + long id = 0; + ++ xcache_admin_auth_check(TSRMLS_C); ++ + if (!xc_initized) { +- php_error_docref(NULL TSRMLS_CC, E_WARNING, "XCache is not initized"); +- RETURN_FALSE; +- } +- +- xcache_admin_auth_check(TSRMLS_C); ++ RETURN_NULL(); ++ } + + if (optype == XC_OP_COUNT) { +@@ -2365,10 +2364,4 @@ + } + +-/* dirty check */ +-#if defined(COMPILE_DL_XCACHE) && (defined(ZEND_WIN32) || defined(__CYGWIN__) || defined(__MINGW32__)) +-# define zend_append_version_info(x) do { } while (0) +-#else +-extern void zend_append_version_info(zend_extension *extension); +-#endif + static int xc_zend_extension_startup(zend_extension *extension) + { +@@ -2377,5 +2370,4 @@ + return FAILURE; + } +- zend_append_version_info(extension); + } + return SUCCESS; +@@ -2640,5 +2632,5 @@ + { + if (xc_zend_extension_gotup) { +- return FAILURE; ++ return SUCCESS; + } + xc_zend_extension_gotup = 1; |