sas Sun Feb 9 16:15:55 2003 EDT Modified files: /php4/main SAPI.c /php4/sapi/apache mod_php4.c /php4/sapi/thttpd thttpd.c Log: use SUCCESS/FAILURE instead of 0/-1 Index: php4/main/SAPI.c diff -u php4/main/SAPI.c:1.164 php4/main/SAPI.c:1.165 --- php4/main/SAPI.c:1.164 Sun Feb 9 14:09:51 2003 +++ php4/main/SAPI.c Sun Feb 9 16:15:54 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: SAPI.c,v 1.164 2003/02/09 19:09:51 sniper Exp $ */ +/* $Id: SAPI.c,v 1.165 2003/02/09 21:15:54 sas Exp $ */ #include <ctype.h> #include <sys/stat.h> @@ -856,7 +856,7 @@ if (sapi_module.get_fd) { return sapi_module.get_fd(fd TSRMLS_CC); } else { - return -1; + return FAILURE; } } @@ -865,7 +865,7 @@ if (sapi_module.force_http_10) { return sapi_module.force_http_10(TSRMLS_C); } else { - return -1; + return FAILURE; } } @@ -875,7 +875,7 @@ if (sapi_module.get_target_uid) { return sapi_module.get_target_uid(obj TSRMLS_CC); } else { - return -1; + return FAILURE; } } @@ -884,7 +884,7 @@ if (sapi_module.get_target_gid) { return sapi_module.get_target_gid(obj TSRMLS_CC); } else { - return -1; + return FAILURE; } } Index: php4/sapi/apache/mod_php4.c diff -u php4/sapi/apache/mod_php4.c:1.154 php4/sapi/apache/mod_php4.c:1.155 --- php4/sapi/apache/mod_php4.c:1.154 Tue Feb 4 19:41:40 2003 +++ php4/sapi/apache/mod_php4.c Sun Feb 9 16:15:54 2003 @@ -17,7 +17,7 @@ | PHP 4.0 patches by Zeev Suraski <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ */ -/* $Id: mod_php4.c,v 1.154 2003/02/05 00:41:40 iliaa Exp $ */ +/* $Id: mod_php4.c,v 1.155 2003/02/09 21:15:54 sas Exp $ */ #include "php_apache_http.h" #include "http_conf_globals.h" @@ -355,9 +355,9 @@ if (fd >= 0) { if (nfd) *nfd = fd; - return 0; + return SUCCESS; } - return -1; + return FAILURE; } /* }}} */ @@ -369,7 +369,7 @@ r->proto_num = HTTP_VERSION(1,0); - return 0; + return SUCCESS; } /* {{{ sapi_apache_get_target_uid @@ -377,7 +377,7 @@ static int sapi_apache_get_target_uid(uid_t *obj TSRMLS_DC) { *obj = ap_user_id; - return 0; + return SUCCESS; } /* {{{ sapi_apache_get_target_gid @@ -385,7 +385,7 @@ static int sapi_apache_get_target_gid(gid_t *obj TSRMLS_DC) { *obj = ap_group_id; - return 0; + return SUCCESS; } /* {{{ sapi_module_struct apache_sapi_module Index: php4/sapi/thttpd/thttpd.c diff -u php4/sapi/thttpd/thttpd.c:1.81 php4/sapi/thttpd/thttpd.c:1.82 --- php4/sapi/thttpd/thttpd.c:1.81 Fri Jan 17 13:53:22 2003 +++ php4/sapi/thttpd/thttpd.c Sun Feb 9 16:15:55 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: thttpd.c,v 1.81 2003/01/17 18:53:22 sas Exp $ */ +/* $Id: thttpd.c,v 1.82 2003/02/09 21:15:55 sas Exp $ */ #include "php.h" #include "SAPI.h" @@ -349,7 +349,7 @@ static int sapi_thttpd_get_fd(int *nfd TSRMLS_DC) { if (nfd) *nfd = TG(hc)->conn_fd; - return 0; + return SUCCESS; } static sapi_module_struct thttpd_sapi_module = {
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php