X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_std_defs.h;h=c9369b5b380fa36a1d1b7c995be9d9a2a03bd38f;hp=59edb29935f319185dc336a1c091b1e5fca75eaa;hb=935edd6c43530eb35c79d8ec8e0920f7d07f5f62;hpb=ae1297f5908f5683e7384395e5ae0e5a295be576 diff --git a/php_http_std_defs.h b/php_http_std_defs.h index 59edb29..c9369b5 100644 --- a/php_http_std_defs.h +++ b/php_http_std_defs.h @@ -31,7 +31,25 @@ typedef int STATUS; #define lenof(S) (sizeof(S) - 1) /* return bool (v == SUCCESS) */ +#define RETVAL_SUCCESS(v) RETVAL_BOOL(SUCCESS == (v)) #define RETURN_SUCCESS(v) RETURN_BOOL(SUCCESS == (v)) +/* return object(values) */ +#define RETVAL_OBJECT(o) \ + return_value->is_ref = 1; \ + return_value->type = IS_OBJECT; \ + return_value->value.obj = (o)->value.obj; \ + zval_add_ref(&return_value) +#define RETURN_OBJECT(o) \ + RETVAL_OBJECT(o); \ + return +#define RETVAL_OBJVAL(ov) \ + return_value->is_ref = 1; \ + return_value->type = IS_OBJECT; \ + return_value->value.obj = (ov); \ + zend_objects_store_add_ref(return_value TSRMLS_CC) +#define RETURN_OBJVAL(ov) \ + RETVAL_OBJVAL(ov); \ + return /* function accepts no args */ #define NO_ARGS \ @@ -64,12 +82,12 @@ typedef int STATUS; /* HTTP 1.1 */ \ "GET, HEAD, POST, PUT, DELETE, OPTIONS, TRACE, CONNECT, " \ /* WebDAV - RFC 2518 */ \ - /* "PROPFIND, PROPPATCH, MKCOL, COPY, MOVE, LOCK, UNLOCK, " */ \ + "PROPFIND, PROPPATCH, MKCOL, COPY, MOVE, LOCK, UNLOCK, " \ /* WebDAV Versioning - RFC 3253 */ \ - /* "VERSION-CONTROL, REPORT, CHECKOUT, CHECKIN, UNCHECKOUT, " */ \ - /* "MKWORKSPACE, UPDATE, LABEL, MERGE, BASELINE-CONTROL, MKACTIVITY, " */ \ + "VERSION-CONTROL, REPORT, CHECKOUT, CHECKIN, UNCHECKOUT, " \ + "MKWORKSPACE, UPDATE, LABEL, MERGE, BASELINE-CONTROL, MKACTIVITY, " \ /* WebDAV Access Control - RFC 3744 */ \ - /* "ACL, " */ \ + "ACL, " \ /* END */