cvs: php4 /sapi/apache mod_php4.c /sapi/cgi cgi_main.c /sapi/isapi php4isapi.c /sapi/pi3web pi3web_sapi.c /sapi/servlet servlet.c
| From: | Zeev Suraski | Date: | Wed, 08 Aug 2001 14:01:23 +0000 |
| Subject: | cvs: php4 /sapi/apache mod_php4.c /sapi/cgi cgi_main.c /sapi/isapi php4isapi.c /sapi/pi3web pi3web_sapi.c /sapi/servlet servlet.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-6650@lists.php.net to get a copy of this message | ||
zeev Wed Aug 8 10:01:23 2001 EDT
Modified files:
/php4/sapi/apache mod_php4.c
/php4/sapi/cgi cgi_main.c
/php4/sapi/isapi php4isapi.c
/php4/sapi/pi3web pi3web_sapi.c
/php4/sapi/servlet servlet.c
Log:
Use zend_first_try
Index: php4/sapi/apache/mod_php4.c
diff -u php4/sapi/apache/mod_php4.c:1.117 php4/sapi/apache/mod_php4.c:1.118
--- php4/sapi/apache/mod_php4.c:1.117 Sun Aug 5 11:29:40 2001
+++ php4/sapi/apache/mod_php4.c Wed Aug 8 10:01:18 2001
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski <zeev@zend.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: mod_php4.c,v 1.117 2001/08/05 15:29:40 sas Exp $ */
+/* $Id: mod_php4.c,v 1.118 2001/08/08 14:01:18 zeev Exp $ */
#define NO_REGEX_EXTRA_H
#ifdef WIN32
@@ -502,7 +502,7 @@
return OK;
}
- zend_try {
+ zend_first_try {
/* We don't accept OPTIONS requests, but take everything else */
if (r->method_number == M_OPTIONS) {
r->allowed |= (1 << METHODS) - 1;
Index: php4/sapi/cgi/cgi_main.c
diff -u php4/sapi/cgi/cgi_main.c:1.131 php4/sapi/cgi/cgi_main.c:1.132
--- php4/sapi/cgi/cgi_main.c:1.131 Sun Aug 5 12:21:33 2001
+++ php4/sapi/cgi/cgi_main.c Wed Aug 8 10:01:21 2001
@@ -486,7 +486,7 @@
tsrm_ls = ts_resource(0);
#endif
- zend_try {
+ zend_first_try {
if (!cgi) {
while ((c=ap_php_getopt(argc, argv, OPTSTRING))!=-1) {
switch (c) {
Index: php4/sapi/isapi/php4isapi.c
diff -u php4/sapi/isapi/php4isapi.c:1.78 php4/sapi/isapi/php4isapi.c:1.79
--- php4/sapi/isapi/php4isapi.c:1.78 Mon Aug 6 12:53:16 2001
+++ php4/sapi/isapi/php4isapi.c Wed Aug 8 10:01:21 2001
@@ -720,7 +720,7 @@
#endif
TSRMLS_FETCH();
- zend_try {
+ zend_first_try {
#ifdef PHP_ENABLE_SEH
__try {
#endif
Index: php4/sapi/pi3web/pi3web_sapi.c
diff -u php4/sapi/pi3web/pi3web_sapi.c:1.30 php4/sapi/pi3web/pi3web_sapi.c:1.31
--- php4/sapi/pi3web/pi3web_sapi.c:1.30 Sun Aug 5 11:29:46 2001
+++ php4/sapi/pi3web/pi3web_sapi.c Wed Aug 8 10:01:21 2001
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pi3web_sapi.c,v 1.30 2001/08/05 15:29:46 sas Exp $ */
+/* $Id: pi3web_sapi.c,v 1.31 2001/08/08 14:01:21 zeev Exp $ */
#include "pi3web_sapi.h"
#include "php.h"
@@ -78,7 +78,7 @@
PUTS("<table border=0 cellpadding=3 cellspacing=1 width=600 align=center>\n");
PUTS("<tr><th colspan=2 bgcolor=\"" PHP_HEADER_COLOR
"\">Pi3Web Server Information</th></tr>\n");
php_info_print_table_header(2, "Information Field", "Value");
- php_info_print_table_row(2, "Pi3Web SAPI module version", "$Id: pi3web_sapi.c,v
1.30 2001/08/05 15:29:46 sas Exp $");
+ php_info_print_table_row(2, "Pi3Web SAPI module version", "$Id: pi3web_sapi.c,v
1.31 2001/08/08 14:01:21 zeev Exp $");
php_info_print_table_row(2, "Server Name Stamp", HTTPCore_getServerStamp());
snprintf(variable_buf, 511, "%d", HTTPCore_debugEnabled());
php_info_print_table_row(2, "Debug Enabled", variable_buf);
@@ -377,7 +377,7 @@
int iRet = PIAPI_COMPLETED;
TSRMLS_FETCH();
- zend_try {
+ zend_first_try {
file_handle.filename = lpCB->lpszFileName;
file_handle.free_filename = 0;
file_handle.type = ZEND_HANDLE_FILENAME;
Index: php4/sapi/servlet/servlet.c
diff -u php4/sapi/servlet/servlet.c:1.58 php4/sapi/servlet/servlet.c:1.59
--- php4/sapi/servlet/servlet.c:1.58 Sun Aug 5 12:21:33 2001
+++ php4/sapi/servlet/servlet.c Wed Aug 8 10:01:22 2001
@@ -320,7 +320,7 @@
#endif
TSRMLS_FETCH();
- zend_try {
+ zend_first_try {
SG(server_context) = emalloc(sizeof(servlet_request));
((servlet_request*)SG(server_context))->jenv=jenv;
((servlet_request*)SG(server_context))->servlet=self;