View | Details | Raw Unified | Return to bug 55793
Collapse All | Expand All

(-)httpd-2.4.6/acinclude.m4 (+45 lines)
Lines 189-202 Link Here
189
  fi
189
  fi
190
190
191
  if test -z "$module_standalone"; then
191
  if test -z "$module_standalone"; then
192
    cat >$modpath_current/probes_$1.libtool.hack<<EOF
193
# probes_$1.lo - a libtool object file
194
# Generated by ltmain.sh - GNU libtool 1.5.20 (1.1220.2.287 2005/08/31 18:54:15)
195
#
196
# Please DO NOT delete this file!
197
# It is necessary for linking the library.
198
199
# Name of the PIC object.
200
pic_object='.libs/probes_$1.o'
201
202
# Name of the non-PIC object.
203
non_pic_object='probes_$1.o'
204
EOF
192
    if test -z "$2"; then
205
    if test -z "$2"; then
193
      # The filename of a convenience library must have a "lib" prefix:
206
      # The filename of a convenience library must have a "lib" prefix:
194
      libname="libmod_$1.la"
207
      libname="libmod_$1.la"
195
      BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
208
      BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
196
      modpath_static="$modpath_static $libname"
209
      modpath_static="$modpath_static $libname"
210
      realobjects=`echo $objects | sed -e 's/\.lo/.o/g;'`
211
      pathobjects=`echo $objects | sed -e 's/\.lo/.o/g;' -e "s#^#$modpath_current/#;" -e "s# # $modpath_current/#g;"`
212
      if test -r "$modpath_current/mod_$1.d"; then
213
        echo "Found probes for $1 [$DTRACE]"
214
        BUILD_DTRACE="\$(DTRACE) \$(DTRACEFLAGS) -G -s \$(top_srcdir)/apache_probes.d -s probes_$1.d $realobjects && cp probes_$1.o .libs/probes_$1.o && cp probes_$1.libtool.hack probes_$1.lo"
215
        DTRACE_OBJ=probes_$1.lo
216
        $DTRACE $DTRACEFLAGS -h -o $modpath_current/probes_$1.h -s $modpath_current/probes_$1.d
217
      elif test "$DTRACE" != "true"; then
218
        BUILD_DTRACE="\$(DTRACE) \$(DTRACEFLAGS) -G -o probes_$1.o -s \$(top_srcdir)/apache_probes.d $realobjects && cp probes_$1.o .libs/probes_$1.o && cp probes_$1.libtool.hack probes_$1.lo"
219
        DTRACE_OBJ=probes_$1.o
220
      else
221
        $DTRACE
222
      fi
197
      cat >>$modpath_current/modules.mk<<EOF
223
      cat >>$modpath_current/modules.mk<<EOF
198
$libname: $objects
224
$libname: $objects
199
	\$(MOD_LINK) $objects $5
225
	\$(MOD_LINK) $objects $5
226
	ld -r -o `echo $libname | sed -e 's/\.la/.o/;'` $realobjects
227
	echo "$pathobjects" > `echo $libname | sed -e 's/\.la/.objects/;'`
200
EOF
228
EOF
201
      if test ! -z "$5"; then
229
      if test ! -z "$5"; then
202
        APR_ADDTO(AP_LIBS, [$5])
230
        APR_ADDTO(AP_LIBS, [$5])
Lines 205-214 Link Here
205
      apache_need_shared=yes
233
      apache_need_shared=yes
206
      libname="mod_$1.la"
234
      libname="mod_$1.la"
207
      shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
235
      shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
236
      realobjects=`echo $objects | sed -e 's/\.lo/.o/g;' -e 's/^/.libs\//g;' -e 's/ / .libs\//g;'`
208
      modpath_shared="$modpath_shared $libname"
237
      modpath_shared="$modpath_shared $libname"
238
      if test -r "$modpath_current/probes_$1.d"; then
239
        echo "Found probes for $1 [$DTRACE]"
240
        BUILD_DTRACE="\$(DTRACE) \$(DTRACEFLAGS) -G -s \$(top_srcdir)/apache_probes.d -s probes_$1.d $realobjects && cp probes_$1.o .libs/probes_$1.o && cp probes_$1.libtool.hack probes_$1.lo"
241
        DTRACE_OBJ=probes_$1.lo
242
        $DTRACE $DTRACEFLAGS -h -o $modpath_current/probes_$1.h -s $modpath_current/probes_$1.d
243
        RELINK="\$(CC) -shared \$(CFLAGS) -o .libs/mod_$1.so $realobjects .libs/probes_$1.o $5"
244
      elif test "$DTRACE" != "true"; then
245
        BUILD_DTRACE="\$(DTRACE) \$(DTRACEFLAGS) -G -o probes_$1.o -s \$(top_srcdir)/apache_probes.d $realobjects && cp probes_$1.o .libs/probes_$1.o && cp probes_$1.libtool.hack probes_$1.lo"
246
        DTRACE_OBJ=probes_$1.lo
247
        RELINK="\$(CC) -shared \$(CFLAGS) -o .libs/mod_$1.so $realobjects .libs/probes_$1.o $5"
248
      else
249
        $DTRACE
250
      fi
209
      cat >>$modpath_current/modules.mk<<EOF
251
      cat >>$modpath_current/modules.mk<<EOF
210
$libname: $shobjects
252
$libname: $shobjects
211
	\$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $4 $objects $5
253
	\$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $4 $objects $5
254
	$BUILD_DTRACE
255
	\$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $4 $objects $DTRACE_OBJ $5
256
	$RELINK
212
EOF
257
EOF
213
    fi
258
    fi
214
  fi
259
  fi
(-)httpd-2.4.6/apache_probes.d (-100 / +160 lines)
Lines 15-222 Link Here
15
  /* Implicit, APR hooks */
15
  /* Implicit, APR hooks */
16
  probe access_checker__entry();
16
  probe access_checker__entry();
17
  probe access_checker__dispatch__invoke(char *);
17
  probe access_checker__dispatch__invoke(char *);
18
  probe access_checker__dispatch__complete(char *, uint32_t);
18
  probe access_checker__dispatch__complete(char *, uintptr_t);
19
  probe access_checker__return(uint32_t);
19
  probe access_checker__return(uintptr_t);
20
  probe access_checker_ex__entry();
21
  probe access_checker_ex__dispatch__invoke(char *);
22
  probe access_checker_ex__dispatch__complete(char *, uintptr_t);
23
  probe access_checker_ex__return(uintptr_t);
20
  probe auth_checker__entry();
24
  probe auth_checker__entry();
21
  probe auth_checker__dispatch__invoke(char *);
25
  probe auth_checker__dispatch__invoke(char *);
22
  probe auth_checker__dispatch__complete(char *, uint32_t);
26
  probe auth_checker__dispatch__complete(char *, uintptr_t);
23
  probe auth_checker__return(uint32_t);
27
  probe auth_checker__return(uintptr_t);
28
  probe cache_status__entry();
29
  probe cache_status__dispatch__invoke(char *);
30
  probe cache_status__dispatch__complete(char *, uintptr_t);
31
  probe cache_status__return(uintptr_t);
24
  probe check_config__entry();
32
  probe check_config__entry();
25
  probe check_config__dispatch__invoke(char *);
33
  probe check_config__dispatch__invoke(char *);
26
  probe check_config__dispatch__complete(char *, uint32_t);
34
  probe check_config__dispatch__complete(char *, uintptr_t);
27
  probe check_config__return(uint32_t);
35
  probe check_config__return(uintptr_t);
28
  probe check_user_id__entry();
36
  probe check_user_id__entry();
29
  probe check_user_id__dispatch__invoke(char *);
37
  probe check_user_id__dispatch__invoke(char *);
30
  probe check_user_id__dispatch__complete(char *, uint32_t);
38
  probe check_user_id__dispatch__complete(char *, uintptr_t);
31
  probe check_user_id__return(uint32_t);
39
  probe check_user_id__return(uintptr_t);
32
  probe child_init__entry();
40
  probe child_init__entry();
33
  probe child_init__dispatch__invoke(char *);
41
  probe child_init__dispatch__invoke(char *);
34
  probe child_init__dispatch__complete(char *, uint32_t);
42
  probe child_init__dispatch__complete(char *, uintptr_t);
35
  probe child_init__return(uint32_t);
43
  probe child_init__return(uintptr_t);
44
  probe child_status__entry();
45
  probe child_status__dispatch__invoke(char *);
46
  probe child_status__dispatch__complete(char *, uintptr_t);
47
  probe child_status__return(uintptr_t);
36
  probe create_connection__entry();
48
  probe create_connection__entry();
37
  probe create_connection__dispatch__invoke(char *);
49
  probe create_connection__dispatch__invoke(char *);
38
  probe create_connection__dispatch__complete(char *, uint32_t);
50
  probe create_connection__dispatch__complete(char *, uintptr_t);
39
  probe create_connection__return(uint32_t);
51
  probe create_connection__return(uintptr_t);
40
  probe create_request__entry();
52
  probe create_request__entry();
41
  probe create_request__dispatch__invoke(char *);
53
  probe create_request__dispatch__invoke(char *);
42
  probe create_request__dispatch__complete(char *, uint32_t);
54
  probe create_request__dispatch__complete(char *, uintptr_t);
43
  probe create_request__return(uint32_t);
55
  probe create_request__return(uintptr_t);
44
  probe default_port__entry();
56
  probe default_port__entry();
45
  probe default_port__dispatch__invoke(char *);
57
  probe default_port__dispatch__invoke(char *);
46
  probe default_port__dispatch__complete(char *, uint32_t);
58
  probe default_port__dispatch__complete(char *, uintptr_t);
47
  probe default_port__return(uint32_t);
59
  probe default_port__return(uintptr_t);
60
  probe dirwalk_stat__entry();
61
  probe dirwalk_stat__dispatch__invoke(char *);
62
  probe dirwalk_stat__dispatch__complete(char *, uintptr_t);
63
  probe dirwalk_stat__return(uintptr_t);
48
  probe drop_privileges__entry();
64
  probe drop_privileges__entry();
49
  probe drop_privileges__dispatch__invoke(char *);
65
  probe drop_privileges__dispatch__invoke(char *);
50
  probe drop_privileges__dispatch__complete(char *, uint32_t);
66
  probe drop_privileges__dispatch__complete(char *, uintptr_t);
51
  probe drop_privileges__return(uint32_t);
67
  probe drop_privileges__return(uintptr_t);
52
  probe error_log__entry();
68
  probe error_log__entry();
53
  probe error_log__dispatch__invoke(char *);
69
  probe error_log__dispatch__invoke(char *);
54
  probe error_log__dispatch__complete(char *, uint32_t);
70
  probe error_log__dispatch__complete(char *, uintptr_t);
55
  probe error_log__return(uint32_t);
71
  probe error_log__return(uintptr_t);
72
  probe expr_lookup__entry();
73
  probe expr_lookup__dispatch__invoke(char *);
74
  probe expr_lookup__dispatch__complete(char *, uintptr_t);
75
  probe expr_lookup__return(uintptr_t);
76
  probe generate_log_id__entry();
77
  probe generate_log_id__dispatch__invoke(char *);
78
  probe generate_log_id__dispatch__complete(char *, uintptr_t);
79
  probe generate_log_id__return(uintptr_t);
56
  probe fatal_exception__entry();
80
  probe fatal_exception__entry();
57
  probe fatal_exception__dispatch__invoke(char *);
81
  probe fatal_exception__dispatch__invoke(char *);
58
  probe fatal_exception__dispatch__complete(char *, uint32_t);
82
  probe fatal_exception__dispatch__complete(char *, uintptr_t);
59
  probe fatal_exception__return(uint32_t);
83
  probe fatal_exception__return(uintptr_t);
60
  probe fixups__entry();
84
  probe fixups__entry();
61
  probe fixups__dispatch__invoke(char *);
85
  probe fixups__dispatch__invoke(char *);
62
  probe fixups__dispatch__complete(char *, uint32_t);
86
  probe fixups__dispatch__complete(char *, uintptr_t);
63
  probe fixups__return(uint32_t);
87
  probe fixups__return(uintptr_t);
64
  probe get_mgmt_items__entry();
88
  probe get_mgmt_items__entry();
65
  probe get_mgmt_items__dispatch__invoke(char *);
89
  probe get_mgmt_items__dispatch__invoke(char *);
66
  probe get_mgmt_items__dispatch__complete(char *, uint32_t);
90
  probe get_mgmt_items__dispatch__complete(char *, uintptr_t);
67
  probe get_mgmt_items__return(uint32_t);
91
  probe get_mgmt_items__return(uintptr_t);
68
  probe get_suexec_identity__entry();
92
  probe get_suexec_identity__entry();
69
  probe get_suexec_identity__dispatch__invoke(char *);
93
  probe get_suexec_identity__dispatch__invoke(char *);
70
  probe get_suexec_identity__dispatch__complete(char *, uint32_t);
94
  probe get_suexec_identity__dispatch__complete(char *, uintptr_t);
71
  probe get_suexec_identity__return(uint32_t);
95
  probe get_suexec_identity__return(uintptr_t);
72
  probe handler__entry();
96
  probe handler__entry();
73
  probe handler__dispatch__invoke(char *);
97
  probe handler__dispatch__invoke(char *);
74
  probe handler__dispatch__complete(char *, uint32_t);
98
  probe handler__dispatch__complete(char *, uintptr_t);
75
  probe handler__return(uint32_t);
99
  probe handler__return(uintptr_t);
76
  probe header_parser__entry();
100
  probe header_parser__entry();
77
  probe header_parser__dispatch__invoke(char *);
101
  probe header_parser__dispatch__invoke(char *);
78
  probe header_parser__dispatch__complete(char *, uint32_t);
102
  probe header_parser__dispatch__complete(char *, uintptr_t);
79
  probe header_parser__return(uint32_t);
103
  probe header_parser__return(uintptr_t);
80
  probe http_scheme__entry();
104
  probe http_scheme__entry();
81
  probe http_scheme__dispatch__invoke(char *);
105
  probe http_scheme__dispatch__invoke(char *);
82
  probe http_scheme__dispatch__complete(char *, uint32_t);
106
  probe http_scheme__dispatch__complete(char *, uintptr_t);
83
  probe http_scheme__return(uint32_t);
107
  probe http_scheme__return(uintptr_t);
84
  probe insert_error_filter__entry();
108
  probe insert_error_filter__entry();
85
  probe insert_error_filter__dispatch__invoke(char *);
109
  probe insert_error_filter__dispatch__invoke(char *);
86
  probe insert_error_filter__dispatch__complete(char *, uint32_t);
110
  probe insert_error_filter__dispatch__complete(char *, uintptr_t);
87
  probe insert_error_filter__return(uint32_t);
111
  probe insert_error_filter__return(uintptr_t);
88
  probe insert_filter__entry();
112
  probe insert_filter__entry();
89
  probe insert_filter__dispatch__invoke(char *);
113
  probe insert_filter__dispatch__invoke(char *);
90
  probe insert_filter__dispatch__complete(char *, uint32_t);
114
  probe insert_filter__dispatch__complete(char *, uintptr_t);
91
  probe insert_filter__return(uint32_t);
115
  probe insert_filter__return(uintptr_t);
116
  probe insert_network_bucket__entry();
117
  probe insert_network_bucket__dispatch__invoke(char *);
118
  probe insert_network_bucket__dispatch__complete(char *, uintptr_t);
119
  probe insert_network_bucket__return(uintptr_t);
92
  probe log_transaction__entry();
120
  probe log_transaction__entry();
93
  probe log_transaction__dispatch__invoke(char *);
121
  probe log_transaction__dispatch__invoke(char *);
94
  probe log_transaction__dispatch__complete(char *, uint32_t);
122
  probe log_transaction__dispatch__complete(char *, uintptr_t);
95
  probe log_transaction__return(uint32_t);
123
  probe log_transaction__return(uintptr_t);
96
  probe map_to_storage__entry();
124
  probe map_to_storage__entry();
97
  probe map_to_storage__dispatch__invoke(char *);
125
  probe map_to_storage__dispatch__invoke(char *);
98
  probe map_to_storage__dispatch__complete(char *, uint32_t);
126
  probe map_to_storage__dispatch__complete(char *, uintptr_t);
99
  probe map_to_storage__return(uint32_t);
127
  probe map_to_storage__return(uintptr_t);
100
  probe monitor__entry();
128
  probe monitor__entry();
101
  probe monitor__dispatch__invoke(char *);
129
  probe monitor__dispatch__invoke(char *);
102
  probe monitor__dispatch__complete(char *, uint32_t);
130
  probe monitor__dispatch__complete(char *, uintptr_t);
103
  probe monitor__return(uint32_t);
131
  probe monitor__return(uintptr_t);
104
  probe mpm__entry();
132
  probe mpm__entry();
105
  probe mpm__dispatch__invoke(char *);
133
  probe mpm__dispatch__invoke(char *);
106
  probe mpm__dispatch__complete(char *, uint32_t);
134
  probe mpm__dispatch__complete(char *, uintptr_t);
107
  probe mpm__return(uint32_t);
135
  probe mpm__return(uintptr_t);
108
  probe mpm_get_name__entry();
136
  probe mpm_get_name__entry();
109
  probe mpm_get_name__dispatch__invoke(char *);
137
  probe mpm_get_name__dispatch__invoke(char *);
110
  probe mpm_get_name__dispatch__complete(char *, uint32_t);
138
  probe mpm_get_name__dispatch__complete(char *, uintptr_t);
111
  probe mpm_get_name__return(uint32_t);
139
  probe mpm_get_name__return(uintptr_t);
112
  probe mpm_note_child_killed__entry();
140
  probe mpm_note_child_killed__entry();
113
  probe mpm_note_child_killed__dispatch__invoke(char *);
141
  probe mpm_note_child_killed__dispatch__invoke(char *);
114
  probe mpm_note_child_killed__dispatch__complete(char *, uint32_t);
142
  probe mpm_note_child_killed__dispatch__complete(char *, uintptr_t);
115
  probe mpm_note_child_killed__return(uint32_t);
143
  probe mpm_note_child_killed__return(uintptr_t);
116
  probe mpm_register_timed_callback__entry();
144
  probe mpm_register_timed_callback__entry();
117
  probe mpm_register_timed_callback__dispatch__invoke(char *);
145
  probe mpm_register_timed_callback__dispatch__invoke(char *);
118
  probe mpm_register_timed_callback__dispatch__complete(char *, uint32_t);
146
  probe mpm_register_timed_callback__dispatch__complete(char *, uintptr_t);
119
  probe mpm_register_timed_callback__return(uint32_t);
147
  probe mpm_register_timed_callback__return(uintptr_t);
120
  probe mpm_query__entry();
148
  probe mpm_query__entry();
121
  probe mpm_query__dispatch__invoke(char *);
149
  probe mpm_query__dispatch__invoke(char *);
122
  probe mpm_query__dispatch__complete(char *, uint32_t);
150
  probe mpm_query__dispatch__complete(char *, uintptr_t);
123
  probe mpm_query__return(uint32_t);
151
  probe mpm_query__return(uintptr_t);
152
  probe end_generation__entry();
153
  probe end_generation__dispatch__invoke(char *);
154
  probe end_generation__dispatch__complete(char *, uintptr_t);
155
  probe end_generation__return(uintptr_t);
156
  probe note_auth_failure__entry();
157
  probe note_auth_failure__dispatch__invoke(char *);
158
  probe note_auth_failure__dispatch__complete(char *, uintptr_t);
159
  probe note_auth_failure__return(uintptr_t);
124
  probe open_logs__entry();
160
  probe open_logs__entry();
125
  probe open_logs__dispatch__invoke(char *);
161
  probe open_logs__dispatch__invoke(char *);
126
  probe open_logs__dispatch__complete(char *, uint32_t);
162
  probe open_logs__dispatch__complete(char *, uintptr_t);
127
  probe open_logs__return(uint32_t);
163
  probe open_logs__return(uintptr_t);
128
  probe optional_fn_retrieve__entry();
164
  probe optional_fn_retrieve__entry();
129
  probe optional_fn_retrieve__dispatch__invoke(char *);
165
  probe optional_fn_retrieve__dispatch__invoke(char *);
130
  probe optional_fn_retrieve__dispatch__complete(char *, uint32_t);
166
  probe optional_fn_retrieve__dispatch__complete(char *, uintptr_t);
131
  probe optional_fn_retrieve__return(uint32_t);
167
  probe optional_fn_retrieve__return(uintptr_t);
132
  probe post_config__entry();
168
  probe post_config__entry();
133
  probe post_config__dispatch__invoke(char *);
169
  probe post_config__dispatch__invoke(char *);
134
  probe post_config__dispatch__complete(char *, uint32_t);
170
  probe post_config__dispatch__complete(char *, uintptr_t);
135
  probe post_config__return(uint32_t);
171
  probe post_config__return(uintptr_t);
172
  probe post_perdir_config__entry();
173
  probe post_perdir_config__dispatch__invoke(char *);
174
  probe post_perdir_config__dispatch__complete(char *, uintptr_t);
175
  probe post_perdir_config__return(uintptr_t);
136
  probe post_read_request__entry();
176
  probe post_read_request__entry();
137
  probe post_read_request__dispatch__invoke(char *);
177
  probe post_read_request__dispatch__invoke(char *);
138
  probe post_read_request__dispatch__complete(char *, uint32_t);
178
  probe post_read_request__dispatch__complete(char *, uintptr_t);
139
  probe post_read_request__return(uint32_t);
179
  probe post_read_request__return(uintptr_t);
180
  probe pre_read_request__entry();
181
  probe pre_read_request__dispatch__invoke(char *);
182
  probe pre_read_request__dispatch__complete(char *, uintptr_t);
183
  probe pre_read_request__return(uintptr_t);
140
  probe pre_config__entry();
184
  probe pre_config__entry();
141
  probe pre_config__dispatch__invoke(char *);
185
  probe pre_config__dispatch__invoke(char *);
142
  probe pre_config__dispatch__complete(char *, uint32_t);
186
  probe pre_config__dispatch__complete(char *, uintptr_t);
143
  probe pre_config__return(uint32_t);
187
  probe pre_config__return(uintptr_t);
144
  probe pre_connection__entry();
188
  probe pre_connection__entry();
145
  probe pre_connection__dispatch__invoke(char *);
189
  probe pre_connection__dispatch__invoke(char *);
146
  probe pre_connection__dispatch__complete(char *, uint32_t);
190
  probe pre_connection__dispatch__complete(char *, uintptr_t);
147
  probe pre_connection__return(uint32_t);
191
  probe pre_connection__return(uintptr_t);
148
  probe pre_mpm__entry();
192
  probe pre_mpm__entry();
149
  probe pre_mpm__dispatch__invoke(char *);
193
  probe pre_mpm__dispatch__invoke(char *);
150
  probe pre_mpm__dispatch__complete(char *, uint32_t);
194
  probe pre_mpm__dispatch__complete(char *, uintptr_t);
151
  probe pre_mpm__return(uint32_t);
195
  probe pre_mpm__return(uintptr_t);
152
  probe process_connection__entry();
196
  probe process_connection__entry();
153
  probe process_connection__dispatch__invoke(char *);
197
  probe process_connection__dispatch__invoke(char *);
154
  probe process_connection__dispatch__complete(char *, uint32_t);
198
  probe process_connection__dispatch__complete(char *, uintptr_t);
155
  probe process_connection__return(uint32_t);
199
  probe process_connection__return(uintptr_t);
156
  probe quick_handler__entry();
200
  probe quick_handler__entry();
157
  probe quick_handler__dispatch__invoke(char *);
201
  probe quick_handler__dispatch__invoke(char *);
158
  probe quick_handler__dispatch__complete(char *, uint32_t);
202
  probe quick_handler__dispatch__complete(char *, uintptr_t);
159
  probe quick_handler__return(uint32_t);
203
  probe quick_handler__return(uintptr_t);
160
  probe test_config__entry();
204
  probe test_config__entry();
161
  probe test_config__dispatch__invoke(char *);
205
  probe test_config__dispatch__invoke(char *);
162
  probe test_config__dispatch__complete(char *, uint32_t);
206
  probe test_config__dispatch__complete(char *, uintptr_t);
163
  probe test_config__return(uint32_t);
207
  probe test_config__return(uintptr_t);
164
  probe translate_name__entry();
208
  probe translate_name__entry();
165
  probe translate_name__dispatch__invoke(char *);
209
  probe translate_name__dispatch__invoke(char *);
166
  probe translate_name__dispatch__complete(char *, uint32_t);
210
  probe translate_name__dispatch__complete(char *, uintptr_t);
167
  probe translate_name__return(uint32_t);
211
  probe translate_name__return(uintptr_t);
168
  probe type_checker__entry();
212
  probe type_checker__entry();
169
  probe type_checker__dispatch__invoke(char *);
213
  probe type_checker__dispatch__invoke(char *);
170
  probe type_checker__dispatch__complete(char *, uint32_t);
214
  probe type_checker__dispatch__complete(char *, uintptr_t);
171
  probe type_checker__return(uint32_t);
215
  probe type_checker__return(uintptr_t);
172
216
173
  /* Implicit, APR hooks for proxy */
217
  /* Implicit, APR hooks for proxy */
174
  probe canon_handler__entry();
218
  probe canon_handler__entry();
175
  probe canon_handler__dispatch__invoke(char *);
219
  probe canon_handler__dispatch__invoke(char *);
176
  probe canon_handler__dispatch__complete(char *, uint32_t);
220
  probe canon_handler__dispatch__complete(char *, uintptr_t);
177
  probe canon_handler__return(uint32_t);
221
  probe canon_handler__return(uintptr_t);
178
  probe post_request__entry();
222
  probe post_request__entry();
179
  probe post_request__dispatch__invoke(char *);
223
  probe post_request__dispatch__invoke(char *);
180
  probe post_request__dispatch__complete(char *, uint32_t);
224
  probe post_request__dispatch__complete(char *, uintptr_t);
181
  probe post_request__return(uint32_t);
225
  probe post_request__return(uintptr_t);
182
  probe pre_request__entry();
226
  probe pre_request__entry();
183
  probe pre_request__dispatch__invoke(char *);
227
  probe pre_request__dispatch__invoke(char *);
184
  probe pre_request__dispatch__complete(char *, uint32_t);
228
  probe pre_request__dispatch__complete(char *, uintptr_t);
185
  probe pre_request__return(uint32_t);
229
  probe pre_request__return(uintptr_t);
186
  probe scheme_handler__entry();
230
  probe scheme_handler__entry();
187
  probe scheme_handler__dispatch__invoke(char *);
231
  probe scheme_handler__dispatch__invoke(char *);
188
  probe scheme_handler__dispatch__complete(char *, uint32_t);
232
  probe scheme_handler__dispatch__complete(char *, uintptr_t);
189
  probe scheme_handler__return(uint32_t);
233
  probe scheme_handler__return(uintptr_t);
190
234
191
  /* Implicit, APR hooks for dav */
235
  /* Implicit, APR hooks for dav */
192
  probe find_liveprop__entry();
236
  probe find_liveprop__entry();
193
  probe find_liveprop__dispatch__invoke(char *);
237
  probe find_liveprop__dispatch__invoke(char *);
194
  probe find_liveprop__dispatch__complete(char *, uint32_t);
238
  probe find_liveprop__dispatch__complete(char *, uintptr_t);
195
  probe find_liveprop__return(uint32_t);
239
  probe find_liveprop__return(uintptr_t);
196
  probe gather_propsets__entry();
240
  probe gather_propsets__entry();
197
  probe gather_propsets__dispatch__invoke(char *);
241
  probe gather_propsets__dispatch__invoke(char *);
198
  probe gather_propsets__dispatch__complete(char *, uint32_t);
242
  probe gather_propsets__dispatch__complete(char *, uintptr_t);
199
  probe gather_propsets__return(uint32_t);
243
  probe gather_propsets__return(uintptr_t);
200
  probe insert_all_liveprops__entry();
244
  probe insert_all_liveprops__entry();
201
  probe insert_all_liveprops__dispatch__invoke(char *);
245
  probe insert_all_liveprops__dispatch__invoke(char *);
202
  probe insert_all_liveprops__dispatch__complete(char *, uint32_t);
246
  probe insert_all_liveprops__dispatch__complete(char *, uintptr_t);
203
  probe insert_all_liveprops__return(uint32_t);
247
  probe insert_all_liveprops__return(uintptr_t);
248
  probe session_load__entry();
249
  probe session_load__dispatch__invoke(char *);
250
  probe session_load__dispatch__complete(char *, uintptr_t);
251
  probe session_load__return(uintptr_t);
252
  probe session_save__entry();
253
  probe session_save__dispatch__invoke(char *);
254
  probe session_save__dispatch__complete(char *, uintptr_t);
255
  probe session_save__return(uintptr_t);
256
  probe session_encode__entry();
257
  probe session_encode__dispatch__invoke(char *);
258
  probe session_encode__dispatch__complete(char *, uintptr_t);
259
  probe session_encode__return(uintptr_t);
260
  probe session_decode__entry();
261
  probe session_decode__dispatch__invoke(char *);
262
  probe session_decode__dispatch__complete(char *, uintptr_t);
263
  probe session_decode__return(uintptr_t);
204
264
205
  /* Implicit, APR hooks for watchdog */
265
  /* Implicit, APR hooks for watchdog */
206
  probe watchdog_exit__entry();
266
  probe watchdog_exit__entry();
207
  probe watchdog_exit__dispatch__invoke(char *);
267
  probe watchdog_exit__dispatch__invoke(char *);
208
  probe watchdog_exit__dispatch__complete(char *, uint32_t);
268
  probe watchdog_exit__dispatch__complete(char *, uintptr_t);
209
  probe watchdog_exit__return(uint32_t);
269
  probe watchdog_exit__return(uintptr_t);
210
  probe watchdog_init__entry();
270
  probe watchdog_init__entry();
211
  probe watchdog_init__dispatch__invoke(char *);
271
  probe watchdog_init__dispatch__invoke(char *);
212
  probe watchdog_init__dispatch__complete(char *, uint32_t);
272
  probe watchdog_init__dispatch__complete(char *, uintptr_t);
213
  probe watchdog_init__return(uint32_t);
273
  probe watchdog_init__return(uintptr_t);
214
  probe watchdog_need__entry();
274
  probe watchdog_need__entry();
215
  probe watchdog_need__dispatch__invoke(char *);
275
  probe watchdog_need__dispatch__invoke(char *);
216
  probe watchdog_need__dispatch__complete(char *, uint32_t);
276
  probe watchdog_need__dispatch__complete(char *, uintptr_t);
217
  probe watchdog_need__return(uint32_t);
277
  probe watchdog_need__return(uintptr_t);
218
  probe watchdog_step__entry();
278
  probe watchdog_step__entry();
219
  probe watchdog_step__dispatch__invoke(char *);
279
  probe watchdog_step__dispatch__invoke(char *);
220
  probe watchdog_step__dispatch__complete(char *, uint32_t);
280
  probe watchdog_step__dispatch__complete(char *, uintptr_t);
221
  probe watchdog_step__return(uint32_t);
281
  probe watchdog_step__return(uintptr_t);
222
};
282
};
(-)httpd-2.4.6/build/library.mk (+7 lines)
Lines 17-22 Link Here
17
# The build environment was provided by Sascha Schumann.
17
# The build environment was provided by Sascha Schumann.
18
18
19
LTLIBRARY_OBJECTS = $(LTLIBRARY_SOURCES:.c=.lo) $(LTLIBRARY_OBJECTS_X)
19
LTLIBRARY_OBJECTS = $(LTLIBRARY_SOURCES:.c=.lo) $(LTLIBRARY_OBJECTS_X)
20
LTLIBRARY_CS = $(LTLIBRARY_SOURCES:%.h=)
21
LTLIBRARY_OS = $(LTLIBRARY_CS:.c=.o)
22
LTLIBRARY_FP_OS = $(LTLIBRARY_OS:%=$(builddir)/%)
23
LIBNAME=$(LTLIBRARY_NAME:.la=.o)
24
LIBLIST=$(LTLIBRARY_NAME:.la=.objects)
20
25
21
$(LTLIBRARY_NAME): $(LTLIBRARY_OBJECTS) $(LTLIBRARY_DEPENDENCIES)
26
$(LTLIBRARY_NAME): $(LTLIBRARY_OBJECTS) $(LTLIBRARY_DEPENDENCIES)
22
	$(LINK) -static $(LTLIBRARY_LDFLAGS) $(LTLIBRARY_OBJECTS) $(LTLIBRARY_LIBADD)
27
	$(LINK) -static $(LTLIBRARY_LDFLAGS) $(LTLIBRARY_OBJECTS) $(LTLIBRARY_LIBADD)
28
	echo $(LTLIBRARY_FP_OS) > $(LIBLIST)
29
	ld -r -o $(LIBNAME) $(LTLIBRARY_OS)
(-)httpd-2.4.6/configure.in (-11 / +21 lines)
Lines 539-567 Link Here
539
AC_ARG_ENABLE(dtrace,APACHE_HELP_STRING(--enable-dtrace,Enable DTrace probes),
539
AC_ARG_ENABLE(dtrace,APACHE_HELP_STRING(--enable-dtrace,Enable DTrace probes),
540
[
540
[
541
  enable_dtrace=$enableval
541
  enable_dtrace=$enableval
542
  if test "$enableval" = "yes"; then
543
    APR_ADDTO(CPPFLAGS, -DAPR_DTRACE_PROVIDER)
544
    AC_MSG_ERROR('DTrace Support in the build system is not complete. Patches Welcome!')
545
  fi
546
],
542
],
547
[
543
[
548
  enable_dtrace=no
544
  enable_dtrace=no
549
])
545
])
550
546
551
dnl Disabled dtrace build for now.
552
enable_dtrace=no
553
554
case $host in
547
case $host in
555
  *-solaris2*)
548
  *-solaris2*)
556
    if test $enable_dtrace = "yes" -a "$ac_cv_header_sys_sdt_h" = "yes"; then
549
    if test $enable_dtrace = "yes" -a "$ac_cv_header_sys_sdt_h" = "yes"; then
557
        AC_DEFINE(AP_ENABLE_DTRACE, 1,
550
        if test -x /usr/sbin/dtrace; then        
558
                  [Enable DTrace probes])
551
            DTRACE="/usr/sbin/dtrace $DTRACEFLAGS"
559
        DTRACE="/usr/sbin/dtrace $DTRACEFLAGS"
552
            AC_DEFINE(AP_ENABLE_DTRACE, 1,
560
        test -f include/apache_probes.h || $DTRACE -h -s apache_probes.d -o include/apache_probes.h
553
                        [Enable DTrace probes])
554
        fi
561
    fi
555
    fi
562
    ;;
556
    ;;
557
  *-linux*)
558
    if test $enable_dtrace = "yes" -a "$ac_cv_header_sys_sdt_h" = "yes"; then
559
        if test -x /usr/bin/dtrace; then
560
            DTRACE="/usr/bin/dtrace $DTRACEFLAGS"        
561
            AC_DEFINE(AP_ENABLE_SYSTEMTAP, 1, 
562
                      [Define if SystemTap probe definitions are used])
563
        fi
564
    fi
565
    ;;
566
  *)
567
    enable_dtrace=no
568
  ;;
563
esac
569
esac
564
570
571
if test $enable_dtrace = "yes"; then
572
    test -f include/apache_probes.h || $DTRACE -h -s apache_probes.d -o include/apache_probes.h
573
fi
574
565
APACHE_SUBST(DTRACE)
575
APACHE_SUBST(DTRACE)
566
576
567
AC_ARG_ENABLE(hook-probes,APACHE_HELP_STRING(--enable-hook-probes,Enable APR hook probes),
577
AC_ARG_ENABLE(hook-probes,APACHE_HELP_STRING(--enable-hook-probes,Enable APR hook probes),
(-)httpd-2.4.6/include/ap_config.h (-7 / +76 lines)
Lines 22-29 Link Here
22
#ifndef AP_CONFIG_H
22
#ifndef AP_CONFIG_H
23
#define AP_CONFIG_H
23
#define AP_CONFIG_H
24
24
25
#include "ap_hooks.h"
26
27
/* Although this file doesn't declare any hooks, declare the exports group here */
25
/* Although this file doesn't declare any hooks, declare the exports group here */
28
/**
26
/**
29
 * @defgroup exports Apache exports
27
 * @defgroup exports Apache exports
Lines 148-164 Link Here
148
#define AP_NONBLOCK_WHEN_MULTI_LISTEN 1
146
#define AP_NONBLOCK_WHEN_MULTI_LISTEN 1
149
#endif
147
#endif
150
148
151
#if defined(AP_ENABLE_DTRACE) && HAVE_SYS_SDT_H
149
150
#include "os.h"
151
#if (!defined(WIN32) && !defined(NETWARE)) || defined(__MINGW32__)
152
#include "ap_config_auto.h"
153
#include "ap_config_layout.h"
154
#endif
155
#if defined(NETWARE)
156
#define AP_NONBLOCK_WHEN_MULTI_LISTEN 1
157
#endif
158
159
/* If APR has OTHER_CHILD logic, use reliable piped logs. */
160
#if APR_HAS_OTHER_CHILD
161
#define AP_HAVE_RELIABLE_PIPED_LOGS TRUE
162
#endif
163
164
/* Presume that the compiler supports C99-style designated
165
 * initializers if using GCC (but not G++), or for any other compiler
166
 * which claims C99 support. */
167
#if (defined(__GNUC__) && !defined(__cplusplus))                \
168
     || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
169
#define AP_HAVE_DESIGNATED_INITIALIZER
170
#endif
171
172
#if AP_ENABLE_DTRACE || AP_ENABLE_SYSTEMTAP
173
174
/* define hook probes before including apr_hooks.h */
175
176
#if HAVE_SYS_SDT_H
152
#include <sys/sdt.h>
177
#include <sys/sdt.h>
153
#else
154
#undef _DTRACE_VERSION
155
#endif
178
#endif
156
179
157
#ifdef _DTRACE_VERSION
180
#define APR_HOOK_PROBES_ENABLED
181
182
#undef APR_HOOK_PROBE_ENTRY
183
#undef APR_HOOK_PROBE_RETURN
184
#undef APR_HOOK_PROBE_INVOKE
185
#undef APR_HOOK_PROBE_COMPLETE
186
187
/* hard-code provider to "ap" instead of using the hook namespace
188
 * so that mod_proxy, mod_dav, and other such hooks with their own
189
 * namespace are part of the "ap" provider
190
 */
191
192
#if AP_ENABLE_SYSTEMTAP
193
194
#define APR_HOOK_PROBE_ENTRY(ud,ns,name,args) \
195
  STAP_PROBE(ap, name##__entry); ud=NULL
196
197
#define APR_HOOK_PROBE_RETURN(ud,ns,name,rv,args) \
198
  STAP_PROBE1(ap, name##__return, rv)
199
200
#define APR_HOOK_PROBE_INVOKE(ud,ns,name,src,args) \
201
  STAP_PROBE1(ap, name##__dispatch__invoke, src)
202
203
#define APR_HOOK_PROBE_COMPLETE(ud,ns,name,src,rv,args) \
204
  STAP_PROBE2(ap, name##__dispatch__complete, src, rv)
205
206
#else
207
208
#define APR_HOOK_PROBE_ENTRY(ud,ns,name,args) \
209
  __dtrace_ap___##name##__entry(); ud=NULL
210
211
#define APR_HOOK_PROBE_RETURN(ud,ns,name,rv,args) \
212
  __dtrace_ap___##name##__return(rv)
213
214
#define APR_HOOK_PROBE_INVOKE(ud,ns,name,src,args) \
215
  __dtrace_ap___##name##__dispatch__invoke(src)
216
217
#define APR_HOOK_PROBE_COMPLETE(ud,ns,name,src,rv,args) \
218
  __dtrace_ap___##name##__dispatch__complete(src, rv)
219
220
#endif
221
  
158
#include "apache_probes.h"
222
#include "apache_probes.h"
223
159
#else
224
#else
225
160
#include "apache_noprobes.h"
226
#include "apache_noprobes.h"
161
#endif
227
228
#endif /* AP_ENABLE_DTRACE */
229
230
#include "ap_hooks.h"
162
231
163
/* If APR has OTHER_CHILD logic, use reliable piped logs. */
232
/* If APR has OTHER_CHILD logic, use reliable piped logs. */
164
#if APR_HAS_OTHER_CHILD
233
#if APR_HAS_OTHER_CHILD
(-)httpd-2.4.6/include/ap_hooks.h (-4 lines)
Lines 32-41 Link Here
32
#define APR_HOOK_PROBES_ENABLED 1
32
#define APR_HOOK_PROBES_ENABLED 1
33
#endif
33
#endif
34
34
35
#ifdef APR_HOOK_PROBES_ENABLED
36
#include "ap_hook_probes.h"
37
#endif
38
39
#include "apr.h"
35
#include "apr.h"
40
#include "apr_hooks.h"
36
#include "apr_hooks.h"
41
#include "apr_optional_hooks.h"
37
#include "apr_optional_hooks.h"
(-)httpd-2.4.6/Makefile.in (-2 / +20 lines)
Lines 2-11 Link Here
2
SUBDIRS = srclib os server modules support
2
SUBDIRS = srclib os server modules support
3
CLEAN_SUBDIRS = test
3
CLEAN_SUBDIRS = test
4
4
5
MPM_LIB = $(MPM_LIB:.la=.o)
6
PROGRAM_DEPENDENCIES_O = $(PROGRAM_DEPENDENCIES:.la=.o)
7
PROGRAM_DEPENDENCIES_OBJECTS = $(PROGRAM_DEPENDENCIES:.la=.objects)
8
5
PROGRAM_NAME         = $(progname)
9
PROGRAM_NAME         = $(progname)
6
PROGRAM_SOURCES      = modules.c
10
PROGRAM_SOURCES      = modules.c
7
PROGRAM_LDADD        = buildmark.o $(HTTPD_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(PCRE_LIBS) $(EXTRA_LIBS) $(AP_LIBS) $(LIBS)
11
PROGRAM_LDADD        = buildmark.o $(HTTPD_LDFLAGS) `cat $(PROGRAM_DEPENDENCIES_OBJECTS)` \
8
PROGRAM_PRELINK      = $(COMPILE) -c $(top_srcdir)/server/buildmark.c
12
			`test -f probes.o && echo probes.o` $(PCRE_LIBS) $(EXTRA_LIBS) $(AP_LIBS) $(LIBS) \
13
			`./libtool-dep-extract $(PROGRAM_DEPENDENCIES)`
14
PROGRAM_PRELINK      = $(COMPILE) -c $(top_srcdir)/server/buildmark.c && \
15
			$(DTRACE) $(DTRACEFLAGS) -G -s apache_probes.d -o probes.o \
16
			modules.o buildmark.o `cat $(PROGRAM_DEPENDENCIES_OBJECTS)`
9
PROGRAM_DEPENDENCIES = \
17
PROGRAM_DEPENDENCIES = \
10
  server/libmain.la \
18
  server/libmain.la \
11
  $(BUILTIN_LIBS) \
19
  $(BUILTIN_LIBS) \
Lines 97-102 Link Here
97
	    fi ; \
105
	    fi ; \
98
	fi
106
	fi
99
107
108
install-dtrace:
109
	@echo Installing DTrace library
110
	@$(MKINSTALLDIRS) $(DESTDIR)/usr/lib/dtrace
111
	@chown root:sys $(DESTDIR)/usr
112
	@chown -R root:bin $(DESTDIR)/usr/lib
113
	@chmod -R 0755 $(DESTDIR)/usr
114
	@cp $(top_srcdir)/ap.d $(DESTDIR)/usr/lib/dtrace
115
	@chown root:bin $(DESTDIR)/usr/lib/dtrace/ap.d
116
	@chmod 0644 $(DESTDIR)/usr/lib/dtrace/ap.d
117
100
# Create a sanitized config_vars.mk
118
# Create a sanitized config_vars.mk
101
build/config_vars.out: build/config_vars.mk
119
build/config_vars.out: build/config_vars.mk
102
	@$(SHELL) build/config_vars.sh < build/config_vars.mk > build/config_vars.out
120
	@$(SHELL) build/config_vars.sh < build/config_vars.mk > build/config_vars.out
(-)httpd-2.4.6/modules/cache/cache_util.h (-1 / +1 lines)
Lines 32-38 Link Here
32
32
33
#include "mod_cache.h"
33
#include "mod_cache.h"
34
34
35
#include "apr_hooks.h"
35
#include "ap_config.h"
36
#include "apr.h"
36
#include "apr.h"
37
#include "apr_lib.h"
37
#include "apr_lib.h"
38
#include "apr_strings.h"
38
#include "apr_strings.h"
(-)httpd-2.4.6/modules/cache/mod_cache.h (-1 / +1 lines)
Lines 29-35 Link Here
29
#include "httpd.h"
29
#include "httpd.h"
30
#include "apr_date.h"
30
#include "apr_date.h"
31
#include "apr_optional.h"
31
#include "apr_optional.h"
32
#include "apr_hooks.h"
32
#include "ap_config.h"
33
33
34
#include "cache_common.h"
34
#include "cache_common.h"
35
35
(-)httpd-2.4.6/modules/core/mod_watchdog.h (-1 / +1 lines)
Lines 36-42 Link Here
36
#include "apr_pools.h"
36
#include "apr_pools.h"
37
#include "apr_shm.h"
37
#include "apr_shm.h"
38
#include "apr_hash.h"
38
#include "apr_hash.h"
39
#include "apr_hooks.h"
39
#include "ap_config.h"
40
#include "apr_optional.h"
40
#include "apr_optional.h"
41
#include "apr_file_io.h"
41
#include "apr_file_io.h"
42
#include "apr_time.h"
42
#include "apr_time.h"
(-)httpd-2.4.6/modules/database/mod_dbd.h (-1 / +1 lines)
Lines 55-61 Link Here
55
#include <httpd.h>
55
#include <httpd.h>
56
#include <apr_optional.h>
56
#include <apr_optional.h>
57
#include <apr_hash.h>
57
#include <apr_hash.h>
58
#include <apr_hooks.h>
58
#include <ap_config.h>
59
59
60
typedef struct {
60
typedef struct {
61
    server_rec *server;
61
    server_rec *server;
(-)httpd-2.4.6/modules/dav/main/mod_dav.h (-1 / +1 lines)
Lines 26-32 Link Here
26
#ifndef _MOD_DAV_H_
26
#ifndef _MOD_DAV_H_
27
#define _MOD_DAV_H_
27
#define _MOD_DAV_H_
28
28
29
#include "apr_hooks.h"
29
#include "ap_config.h"
30
#include "apr_hash.h"
30
#include "apr_hash.h"
31
#include "apr_dbm.h"
31
#include "apr_dbm.h"
32
#include "apr_tables.h"
32
#include "apr_tables.h"
(-)httpd-2.4.6/modules/filters/config.m4 (-1 / +2 lines)
Lines 20-26 Link Here
20
    if test "x$enable_sed" = "xshared"; then
20
    if test "x$enable_sed" = "xshared"; then
21
        # The only symbol which needs to be exported is the module
21
        # The only symbol which needs to be exported is the module
22
        # structure, so ask libtool to hide libsed internals:
22
        # structure, so ask libtool to hide libsed internals:
23
        APR_ADDTO(MOD_SED_LDADD, [-export-symbols-regex sed_module])
23
        # APR_ADDTO(MOD_SED_LDADD, [-export-symbols-regex sed_module])
24
        true
24
    fi
25
    fi
25
])
26
])
26
27
(-)httpd-2.4.6/modules/lua/mod_lua.h (-1 / +1 lines)
Lines 38-44 Link Here
38
#include "apr_buckets.h"
38
#include "apr_buckets.h"
39
#include "apr_file_info.h"
39
#include "apr_file_info.h"
40
#include "apr_time.h"
40
#include "apr_time.h"
41
#include "apr_hooks.h"
41
#include "ap_config.h"
42
#include "apr_reslist.h"
42
#include "apr_reslist.h"
43
43
44
/* Allow for Lua 5.2 backwards compatibility */
44
/* Allow for Lua 5.2 backwards compatibility */
(-)httpd-2.4.6/modules/proxy/ajp.h (-1 / +1 lines)
Lines 29-35 Link Here
29
#include "apr_version.h"
29
#include "apr_version.h"
30
#include "apr.h"
30
#include "apr.h"
31
31
32
#include "apr_hooks.h"
32
#include "ap_config.h"
33
#include "apr_lib.h"
33
#include "apr_lib.h"
34
#include "apr_strings.h"
34
#include "apr_strings.h"
35
#include "apr_buckets.h"
35
#include "apr_buckets.h"
(-)httpd-2.4.6/modules/proxy/mod_proxy.h (-1 / +1 lines)
Lines 26-32 Link Here
26
 * @{
26
 * @{
27
 */
27
 */
28
28
29
#include "apr_hooks.h"
29
#include "ap_config.h"
30
#include "apr_optional.h"
30
#include "apr_optional.h"
31
#include "apr.h"
31
#include "apr.h"
32
#include "apr_lib.h"
32
#include "apr_lib.h"
(-)httpd-2.4.6/modules/session/mod_session.h (-1 / +1 lines)
Lines 47-53 Link Here
47
 * @{
47
 * @{
48
 */
48
 */
49
49
50
#include "apr_hooks.h"
50
#include "ap_config.h"
51
#include "apr_optional.h"
51
#include "apr_optional.h"
52
#include "apr_tables.h"
52
#include "apr_tables.h"
53
#include "apr_uuid.h"
53
#include "apr_uuid.h"
(-)httpd-2.4.6/modules/ssl/config.m4 (-1 / +4 lines)
Lines 43-49 Link Here
43
        if test "x$enable_ssl" = "xshared"; then
43
        if test "x$enable_ssl" = "xshared"; then
44
           # The only symbol which needs to be exported is the module
44
           # The only symbol which needs to be exported is the module
45
           # structure, so ask libtool to hide everything else:
45
           # structure, so ask libtool to hide everything else:
46
           APR_ADDTO(MOD_SSL_LDADD, [-export-symbols-regex ssl_module])
46
47
           # FIXME: -export-symbols-regex not working on Solaris
48
           # APR_ADDTO(MOD_SSL_LDADD, [-export-symbols-regex ssl_module])
49
           true
47
        fi
50
        fi
48
    else
51
    else
49
        enable_ssl=no
52
        enable_ssl=no
(-)httpd-2.4.6/server/Makefile.in (-1 / +1 lines)
Lines 60-66 Link Here
60
	  for dir in $(EXPORT_DIRS_APR); do \
60
	  for dir in $(EXPORT_DIRS_APR); do \
61
	      ls $$dir/ap[ru].h $$dir/ap[ru]_*.h 2>/dev/null; \
61
	      ls $$dir/ap[ru].h $$dir/ap[ru]_*.h 2>/dev/null; \
62
	  done; \
62
	  done; \
63
	) | sed -e s,//,/,g | sort -u > $@
63
	) | sed -e s,//,/,g | sort -u | grep -v apache_probes.h  > $@
64
64
65
exports.c: export_files
65
exports.c: export_files
66
	$(AWK) -f $(top_srcdir)/build/make_exports.awk `cat $?` > $@
66
	$(AWK) -f $(top_srcdir)/build/make_exports.awk `cat $?` > $@
(-)httpd-2.4.6/server/mpm/event/Makefile.in (-1 / +6 lines)
Line 1 Link Here
1
include $(top_srcdir)/build/special.mk
1
# include $(top_srcdir)/build/special.mk
2
3
LTLIBRARY_NAME    = libevent.la
4
LTLIBRARY_SOURCES = event.c fdqueue.c pod.c
5
6
include $(top_srcdir)/build/ltlib.mk

Return to bug 55793