mirror of
https://github.com/php/php-src.git
synced 2024-11-24 18:34:21 +08:00
Use zend_first_try
This commit is contained in:
parent
815d043b1e
commit
6ecae422c4
@ -502,7 +502,7 @@ static int send_php(request_rec *r, int display_source_mode, char *filename)
|
||||
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;
|
||||
|
@ -486,7 +486,7 @@ any .htaccess restrictions anywhere on your site you can leave doc_root undefine
|
||||
tsrm_ls = ts_resource(0);
|
||||
#endif
|
||||
|
||||
zend_try {
|
||||
zend_first_try {
|
||||
if (!cgi) {
|
||||
while ((c=ap_php_getopt(argc, argv, OPTSTRING))!=-1) {
|
||||
switch (c) {
|
||||
|
@ -720,7 +720,7 @@ DWORD WINAPI HttpExtensionProc(LPEXTENSION_CONTROL_BLOCK lpECB)
|
||||
#endif
|
||||
TSRMLS_FETCH();
|
||||
|
||||
zend_try {
|
||||
zend_first_try {
|
||||
#ifdef PHP_ENABLE_SEH
|
||||
__try {
|
||||
#endif
|
||||
|
@ -377,7 +377,7 @@ DWORD PHP4_wrapper(LPCONTROL_BLOCK lpCB)
|
||||
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;
|
||||
|
@ -320,7 +320,7 @@ JNIEXPORT void JNICALL Java_net_php_servlet_send
|
||||
#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;
|
||||
|
Loading…
Reference in New Issue
Block a user