@@ -64,11 +64,7 @@ static void nr_php_set_initial_path(nrtxn_t* txn TSRMLS_DC) {
64
64
return ;
65
65
}
66
66
67
- #ifdef PHP7
68
67
server = & PG (http_globals )[TRACK_VARS_SERVER ];
69
- #else
70
- server = PG (http_globals )[TRACK_VARS_SERVER ];
71
- #endif /* PHP7 */
72
68
73
69
if (nr_php_is_zval_valid_array (server )) {
74
70
if ((NR_PHP_PROCESS_GLOBALS (special_flags ).enable_path_translated )
@@ -89,17 +85,10 @@ static void nr_php_set_initial_path(nrtxn_t* txn TSRMLS_DC) {
89
85
"SCRIPT_NAME" ))) {
90
86
whence = "WT_IS_FILENAME & SCRIPT_NAME" ;
91
87
/* uri has a zval with the name of the script */
92
- #ifdef PHP7
93
88
} else if (CG (active_op_array )) {
94
89
whence = "WT_IS_FILENAME & op_array" ;
95
90
suri = nr_php_op_array_file_name (CG (active_op_array ));
96
91
/* suri has a char* to the name of the script */
97
- #else
98
- } else if (EG (active_op_array )) {
99
- whence = "WT_IS_FILENAME & op_array" ;
100
- suri = nr_php_op_array_file_name (EG (active_op_array ));
101
- /* suri has a char* to the name of the script */
102
- #endif /* PHP7 */
103
92
}
104
93
105
94
if ((NULL == uri ) && (NULL == suri )) {
@@ -213,29 +202,21 @@ static int nr_php_capture_request_parameter(zval* element,
213
202
nr_double_to_str (datastr , sizeof (datastr ), Z_DVAL_P (element ));
214
203
break ;
215
204
216
- #ifdef PHP7
217
205
case IS_TRUE :
218
206
nr_strcpy (datastr , "true" );
219
207
break ;
220
208
221
209
case IS_FALSE :
222
210
nr_strcpy (datastr , "false" );
223
211
break ;
224
- #else
225
- case IS_BOOL :
226
- nr_strcpy (datastr , Z_BVAL_P (element ) ? "true" : "false" );
227
- break ;
228
- #endif /* PHP7 */
229
212
230
213
case IS_STRING : {
231
214
nr_string_len_t len ;
232
215
233
- #ifdef PHP7
234
216
if (NULL == Z_STR_P (element )) {
235
217
nr_strcpy (datastr , "[invalid string]" );
236
218
break ;
237
219
}
238
- #endif /* PHP7 */
239
220
240
221
len = Z_STRLEN_P (element ) < NR_MAX_STRLEN ? Z_STRLEN_P (element )
241
222
: NR_MAX_STRLEN - 1 ;
0 commit comments