]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.3' into PHP-7.4
authorGeorge Wang <gwang@php.net>
Fri, 12 Apr 2019 21:48:22 +0000 (17:48 -0400)
committerGeorge Wang <gwang@php.net>
Fri, 12 Apr 2019 21:48:22 +0000 (17:48 -0400)
1  2 
sapi/litespeed/lsapi_main.c
sapi/litespeed/lsapilib.c
sapi/litespeed/lsapilib.h

index 4a6b1a0f3f91de7272c61dfb3e09b22a79899781,2598141722fc210040e97123191aee3d7f45b16c..66f973ada81e57445a470453e316aea1ce6ff739
@@@ -1504,3 -1517,27 +1507,18 @@@ PHP_FUNCTION(apache_get_modules
      }
  }
  /* }}} */
 -
 -/*
 - * Local variables:
 - * tab-width: 4
 - * c-basic-offset: 4
 - * End:
 - * vim600: sw=4 ts=4 fdm=marker
 - * vim<600: sw=4 ts=4
 - */
+ /* {{{ proto array litespeed_finish_request(void)
+    Flushes all response data to the client */
+ PHP_FUNCTION(litespeed_finish_request)
+ {
+     if (ZEND_NUM_ARGS() > 0) {
+         WRONG_PARAM_COUNT;
+     }
+     if (LSAPI_End_Response() != -1) {
+         RETURN_TRUE;
+     }
+     RETURN_FALSE;
+ }
+ /* }}} */
Simple merge
Simple merge