archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

first shot remove TSRMLS_* things

Browse source
This commit is contained in:
Anatol Belski 2014-12-13 23:06:14 +01:00
parent bb66f385d0
commit bdeb220f48
786 changed files with 27049 additions and 27411 deletions
Download patch file Download diff file Expand all files Collapse all files

30
sapi/apache2handler/php_functions.c
View file

@ -56,7 +56,7 @@ php_apache2_info_struct php_apache2_info;
#define SECTION(name) PUTS("<h2>" name "</h2>\n")
static request_rec *php_apache_lookup_uri(char *filename TSRMLS_DC)
static request_rec *php_apache_lookup_uri(char *filename)
{
php_struct *ctx = SG(server_context);
@ -75,31 +75,31 @@ PHP_FUNCTION(virtual)
size_t filename_len;
request_rec *rr;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "p", &filename, &filename_len) == FAILURE) {
if (zend_parse_parameters(ZEND_NUM_ARGS(), "p", &filename, &filename_len) == FAILURE) {
return;
}
if (!(rr = php_apache_lookup_uri(filename TSRMLS_CC))) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to include '%s' - URI lookup failed", filename);
if (!(rr = php_apache_lookup_uri(filename))) {
php_error_docref(NULL, E_WARNING, "Unable to include '%s' - URI lookup failed", filename);
RETURN_FALSE;
}
if (rr->status != HTTP_OK) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to include '%s' - error finding URI", filename);
php_error_docref(NULL, E_WARNING, "Unable to include '%s' - error finding URI", filename);
ap_destroy_sub_req(rr);
RETURN_FALSE;
}
/* Flush everything. */
php_output_end_all(TSRMLS_C);
php_header(TSRMLS_C);
php_output_end_all();
php_header();
/* Ensure that the ap_r* layer for the main request is flushed, to
* work around http://issues.apache.org/bugzilla/show_bug.cgi?id=17629 */
ap_rflush(rr->main);
if (ap_run_sub_req(rr)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to include '%s' - request execution failed", filename);
php_error_docref(NULL, E_WARNING, "Unable to include '%s' - request execution failed", filename);
ap_destroy_sub_req(rr);
RETURN_FALSE;
}
@ -121,12 +121,12 @@ PHP_FUNCTION(apache_lookup_uri)
char *filename;
size_t filename_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "p", &filename, &filename_len) == FAILURE) {
if (zend_parse_parameters(ZEND_NUM_ARGS(), "p", &filename, &filename_len) == FAILURE) {
return;
}
if (!(rr = php_apache_lookup_uri(filename TSRMLS_CC))) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to include '%s' - URI lookup failed", filename);
if (!(rr = php_apache_lookup_uri(filename))) {
php_error_docref(NULL, E_WARNING, "Unable to include '%s' - URI lookup failed", filename);
RETURN_FALSE;
}
@ -163,7 +163,7 @@ PHP_FUNCTION(apache_lookup_uri)
return;
}
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to include '%s' - error finding URI", filename);
php_error_docref(NULL, E_WARNING, "Unable to include '%s' - error finding URI", filename);
ap_destroy_sub_req(rr);
RETURN_FALSE;
}
@ -225,7 +225,7 @@ PHP_FUNCTION(apache_note)
size_t note_name_len, note_val_len;
char *old_note_val=NULL;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|s", &note_name, &note_name_len, &note_val, &note_val_len) == FAILURE) {
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|s", &note_name, &note_name_len, &note_val, &note_val_len) == FAILURE) {
return;
}
@ -259,7 +259,7 @@ PHP_FUNCTION(apache_setenv)
int arg_count = ZEND_NUM_ARGS();
request_rec *r;
if (zend_parse_parameters(arg_count TSRMLS_CC, "ss|b", &variable, &variable_len, &string_val, &string_val_len, &walk_to_top) == FAILURE) {
if (zend_parse_parameters(arg_count, "ss|b", &variable, &variable_len, &string_val, &string_val_len, &walk_to_top) == FAILURE) {
return;
}
@ -295,7 +295,7 @@ PHP_FUNCTION(apache_getenv)
char *env_val=NULL;
request_rec *r;
if (zend_parse_parameters(arg_count TSRMLS_CC, "s|b", &variable, &variable_len, &walk_to_top) == FAILURE) {
if (zend_parse_parameters(arg_count, "s|b", &variable, &variable_len, &walk_to_top) == FAILURE) {
return;
}