--- httpd-2.4.6/acinclude.m4	2013-01-30 20:25:31.000000000 +0400
+++ httpd-2.4.6/acinclude.m4	2013-11-18 17:12:38.400158351 +0400
@@ -189,14 +189,42 @@ 
   fi
 
   if test -z "$module_standalone"; then
+    cat >$modpath_current/probes_$1.libtool.hack<<EOF
+# probes_$1.lo - a libtool object file
+# Generated by ltmain.sh - GNU libtool 1.5.20 (1.1220.2.287 2005/08/31 18:54:15)
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# Name of the PIC object.
+pic_object='.libs/probes_$1.o'
+
+# Name of the non-PIC object.
+non_pic_object='probes_$1.o'
+EOF
     if test -z "$2"; then
       # The filename of a convenience library must have a "lib" prefix:
       libname="libmod_$1.la"
       BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
       modpath_static="$modpath_static $libname"
+      realobjects=`echo $objects | sed -e 's/\.lo/.o/g;'`
+      pathobjects=`echo $objects | sed -e 's/\.lo/.o/g;' -e "s#^#$modpath_current/#;" -e "s# # $modpath_current/#g;"`
+      if test -r "$modpath_current/mod_$1.d"; then
+        echo "Found probes for $1 [$DTRACE]"
+        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"
+        DTRACE_OBJ=probes_$1.lo
+        $DTRACE $DTRACEFLAGS -h -o $modpath_current/probes_$1.h -s $modpath_current/probes_$1.d
+      elif test "$DTRACE" != "true"; then
+        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"
+        DTRACE_OBJ=probes_$1.o
+      else
+        $DTRACE
+      fi
       cat >>$modpath_current/modules.mk<<EOF
 $libname: $objects
 	\$(MOD_LINK) $objects $5
+	ld -r -o `echo $libname | sed -e 's/\.la/.o/;'` $realobjects
+	echo "$pathobjects" > `echo $libname | sed -e 's/\.la/.objects/;'`
 EOF
       if test ! -z "$5"; then
         APR_ADDTO(AP_LIBS, [$5])
@@ -205,10 +233,27 @@ 
       apache_need_shared=yes
       libname="mod_$1.la"
       shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
+      realobjects=`echo $objects | sed -e 's/\.lo/.o/g;' -e 's/^/.libs\//g;' -e 's/ / .libs\//g;'`
       modpath_shared="$modpath_shared $libname"
+      if test -r "$modpath_current/probes_$1.d"; then
+        echo "Found probes for $1 [$DTRACE]"
+        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"
+        DTRACE_OBJ=probes_$1.lo
+        $DTRACE $DTRACEFLAGS -h -o $modpath_current/probes_$1.h -s $modpath_current/probes_$1.d
+        RELINK="\$(CC) -shared \$(CFLAGS) -o .libs/mod_$1.so $realobjects .libs/probes_$1.o $5"
+      elif test "$DTRACE" != "true"; then
+        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"
+        DTRACE_OBJ=probes_$1.lo
+        RELINK="\$(CC) -shared \$(CFLAGS) -o .libs/mod_$1.so $realobjects .libs/probes_$1.o $5"
+      else
+        $DTRACE
+      fi
       cat >>$modpath_current/modules.mk<<EOF
 $libname: $shobjects
 	\$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $4 $objects $5
+	$BUILD_DTRACE
+	\$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $4 $objects $DTRACE_OBJ $5
+	$RELINK
 EOF
     fi
   fi
--- httpd-2.4.6/apache_probes.d	2009-12-18 18:29:55.000000000 +0300
+++ httpd-2.4.6/apache_probes.d	2013-11-18 15:36:38.956208043 +0400
@@ -15,208 +15,268 @@ 
   /* Implicit, APR hooks */
   probe access_checker__entry();
   probe access_checker__dispatch__invoke(char *);
-  probe access_checker__dispatch__complete(char *, uint32_t);
-  probe access_checker__return(uint32_t);
+  probe access_checker__dispatch__complete(char *, uintptr_t);
+  probe access_checker__return(uintptr_t);
+  probe access_checker_ex__entry();
+  probe access_checker_ex__dispatch__invoke(char *);
+  probe access_checker_ex__dispatch__complete(char *, uintptr_t);
+  probe access_checker_ex__return(uintptr_t);
   probe auth_checker__entry();
   probe auth_checker__dispatch__invoke(char *);
-  probe auth_checker__dispatch__complete(char *, uint32_t);
-  probe auth_checker__return(uint32_t);
+  probe auth_checker__dispatch__complete(char *, uintptr_t);
+  probe auth_checker__return(uintptr_t);
+  probe cache_status__entry();
+  probe cache_status__dispatch__invoke(char *);
+  probe cache_status__dispatch__complete(char *, uintptr_t);
+  probe cache_status__return(uintptr_t);
   probe check_config__entry();
   probe check_config__dispatch__invoke(char *);
-  probe check_config__dispatch__complete(char *, uint32_t);
-  probe check_config__return(uint32_t);
+  probe check_config__dispatch__complete(char *, uintptr_t);
+  probe check_config__return(uintptr_t);
   probe check_user_id__entry();
   probe check_user_id__dispatch__invoke(char *);
-  probe check_user_id__dispatch__complete(char *, uint32_t);
-  probe check_user_id__return(uint32_t);
+  probe check_user_id__dispatch__complete(char *, uintptr_t);
+  probe check_user_id__return(uintptr_t);
   probe child_init__entry();
   probe child_init__dispatch__invoke(char *);
-  probe child_init__dispatch__complete(char *, uint32_t);
-  probe child_init__return(uint32_t);
+  probe child_init__dispatch__complete(char *, uintptr_t);
+  probe child_init__return(uintptr_t);
+  probe child_status__entry();
+  probe child_status__dispatch__invoke(char *);
+  probe child_status__dispatch__complete(char *, uintptr_t);
+  probe child_status__return(uintptr_t);
   probe create_connection__entry();
   probe create_connection__dispatch__invoke(char *);
-  probe create_connection__dispatch__complete(char *, uint32_t);
-  probe create_connection__return(uint32_t);
+  probe create_connection__dispatch__complete(char *, uintptr_t);
+  probe create_connection__return(uintptr_t);
   probe create_request__entry();
   probe create_request__dispatch__invoke(char *);
-  probe create_request__dispatch__complete(char *, uint32_t);
-  probe create_request__return(uint32_t);
+  probe create_request__dispatch__complete(char *, uintptr_t);
+  probe create_request__return(uintptr_t);
   probe default_port__entry();
   probe default_port__dispatch__invoke(char *);
-  probe default_port__dispatch__complete(char *, uint32_t);
-  probe default_port__return(uint32_t);
+  probe default_port__dispatch__complete(char *, uintptr_t);
+  probe default_port__return(uintptr_t);
+  probe dirwalk_stat__entry();
+  probe dirwalk_stat__dispatch__invoke(char *);
+  probe dirwalk_stat__dispatch__complete(char *, uintptr_t);
+  probe dirwalk_stat__return(uintptr_t);
   probe drop_privileges__entry();
   probe drop_privileges__dispatch__invoke(char *);
-  probe drop_privileges__dispatch__complete(char *, uint32_t);
-  probe drop_privileges__return(uint32_t);
+  probe drop_privileges__dispatch__complete(char *, uintptr_t);
+  probe drop_privileges__return(uintptr_t);
   probe error_log__entry();
   probe error_log__dispatch__invoke(char *);
-  probe error_log__dispatch__complete(char *, uint32_t);
-  probe error_log__return(uint32_t);
+  probe error_log__dispatch__complete(char *, uintptr_t);
+  probe error_log__return(uintptr_t);
+  probe expr_lookup__entry();
+  probe expr_lookup__dispatch__invoke(char *);
+  probe expr_lookup__dispatch__complete(char *, uintptr_t);
+  probe expr_lookup__return(uintptr_t);
+  probe generate_log_id__entry();
+  probe generate_log_id__dispatch__invoke(char *);
+  probe generate_log_id__dispatch__complete(char *, uintptr_t);
+  probe generate_log_id__return(uintptr_t);
   probe fatal_exception__entry();
   probe fatal_exception__dispatch__invoke(char *);
-  probe fatal_exception__dispatch__complete(char *, uint32_t);
-  probe fatal_exception__return(uint32_t);
+  probe fatal_exception__dispatch__complete(char *, uintptr_t);
+  probe fatal_exception__return(uintptr_t);
   probe fixups__entry();
   probe fixups__dispatch__invoke(char *);
-  probe fixups__dispatch__complete(char *, uint32_t);
-  probe fixups__return(uint32_t);
+  probe fixups__dispatch__complete(char *, uintptr_t);
+  probe fixups__return(uintptr_t);
   probe get_mgmt_items__entry();
   probe get_mgmt_items__dispatch__invoke(char *);
-  probe get_mgmt_items__dispatch__complete(char *, uint32_t);
-  probe get_mgmt_items__return(uint32_t);
+  probe get_mgmt_items__dispatch__complete(char *, uintptr_t);
+  probe get_mgmt_items__return(uintptr_t);
   probe get_suexec_identity__entry();
   probe get_suexec_identity__dispatch__invoke(char *);
-  probe get_suexec_identity__dispatch__complete(char *, uint32_t);
-  probe get_suexec_identity__return(uint32_t);
+  probe get_suexec_identity__dispatch__complete(char *, uintptr_t);
+  probe get_suexec_identity__return(uintptr_t);
   probe handler__entry();
   probe handler__dispatch__invoke(char *);
-  probe handler__dispatch__complete(char *, uint32_t);
-  probe handler__return(uint32_t);
+  probe handler__dispatch__complete(char *, uintptr_t);
+  probe handler__return(uintptr_t);
   probe header_parser__entry();
   probe header_parser__dispatch__invoke(char *);
-  probe header_parser__dispatch__complete(char *, uint32_t);
-  probe header_parser__return(uint32_t);
+  probe header_parser__dispatch__complete(char *, uintptr_t);
+  probe header_parser__return(uintptr_t);
   probe http_scheme__entry();
   probe http_scheme__dispatch__invoke(char *);
-  probe http_scheme__dispatch__complete(char *, uint32_t);
-  probe http_scheme__return(uint32_t);
+  probe http_scheme__dispatch__complete(char *, uintptr_t);
+  probe http_scheme__return(uintptr_t);
   probe insert_error_filter__entry();
   probe insert_error_filter__dispatch__invoke(char *);
-  probe insert_error_filter__dispatch__complete(char *, uint32_t);
-  probe insert_error_filter__return(uint32_t);
+  probe insert_error_filter__dispatch__complete(char *, uintptr_t);
+  probe insert_error_filter__return(uintptr_t);
   probe insert_filter__entry();
   probe insert_filter__dispatch__invoke(char *);
-  probe insert_filter__dispatch__complete(char *, uint32_t);
-  probe insert_filter__return(uint32_t);
+  probe insert_filter__dispatch__complete(char *, uintptr_t);
+  probe insert_filter__return(uintptr_t);
+  probe insert_network_bucket__entry();
+  probe insert_network_bucket__dispatch__invoke(char *);
+  probe insert_network_bucket__dispatch__complete(char *, uintptr_t);
+  probe insert_network_bucket__return(uintptr_t);
   probe log_transaction__entry();
   probe log_transaction__dispatch__invoke(char *);
-  probe log_transaction__dispatch__complete(char *, uint32_t);
-  probe log_transaction__return(uint32_t);
+  probe log_transaction__dispatch__complete(char *, uintptr_t);
+  probe log_transaction__return(uintptr_t);
   probe map_to_storage__entry();
   probe map_to_storage__dispatch__invoke(char *);
-  probe map_to_storage__dispatch__complete(char *, uint32_t);
-  probe map_to_storage__return(uint32_t);
+  probe map_to_storage__dispatch__complete(char *, uintptr_t);
+  probe map_to_storage__return(uintptr_t);
   probe monitor__entry();
   probe monitor__dispatch__invoke(char *);
-  probe monitor__dispatch__complete(char *, uint32_t);
-  probe monitor__return(uint32_t);
+  probe monitor__dispatch__complete(char *, uintptr_t);
+  probe monitor__return(uintptr_t);
   probe mpm__entry();
   probe mpm__dispatch__invoke(char *);
-  probe mpm__dispatch__complete(char *, uint32_t);
-  probe mpm__return(uint32_t);
+  probe mpm__dispatch__complete(char *, uintptr_t);
+  probe mpm__return(uintptr_t);
   probe mpm_get_name__entry();
   probe mpm_get_name__dispatch__invoke(char *);
-  probe mpm_get_name__dispatch__complete(char *, uint32_t);
-  probe mpm_get_name__return(uint32_t);
+  probe mpm_get_name__dispatch__complete(char *, uintptr_t);
+  probe mpm_get_name__return(uintptr_t);
   probe mpm_note_child_killed__entry();
   probe mpm_note_child_killed__dispatch__invoke(char *);
-  probe mpm_note_child_killed__dispatch__complete(char *, uint32_t);
-  probe mpm_note_child_killed__return(uint32_t);
+  probe mpm_note_child_killed__dispatch__complete(char *, uintptr_t);
+  probe mpm_note_child_killed__return(uintptr_t);
   probe mpm_register_timed_callback__entry();
   probe mpm_register_timed_callback__dispatch__invoke(char *);
-  probe mpm_register_timed_callback__dispatch__complete(char *, uint32_t);
-  probe mpm_register_timed_callback__return(uint32_t);
+  probe mpm_register_timed_callback__dispatch__complete(char *, uintptr_t);
+  probe mpm_register_timed_callback__return(uintptr_t);
   probe mpm_query__entry();
   probe mpm_query__dispatch__invoke(char *);
-  probe mpm_query__dispatch__complete(char *, uint32_t);
-  probe mpm_query__return(uint32_t);
+  probe mpm_query__dispatch__complete(char *, uintptr_t);
+  probe mpm_query__return(uintptr_t);
+  probe end_generation__entry();
+  probe end_generation__dispatch__invoke(char *);
+  probe end_generation__dispatch__complete(char *, uintptr_t);
+  probe end_generation__return(uintptr_t);
+  probe note_auth_failure__entry();
+  probe note_auth_failure__dispatch__invoke(char *);
+  probe note_auth_failure__dispatch__complete(char *, uintptr_t);
+  probe note_auth_failure__return(uintptr_t);
   probe open_logs__entry();
   probe open_logs__dispatch__invoke(char *);
-  probe open_logs__dispatch__complete(char *, uint32_t);
-  probe open_logs__return(uint32_t);
+  probe open_logs__dispatch__complete(char *, uintptr_t);
+  probe open_logs__return(uintptr_t);
   probe optional_fn_retrieve__entry();
   probe optional_fn_retrieve__dispatch__invoke(char *);
-  probe optional_fn_retrieve__dispatch__complete(char *, uint32_t);
-  probe optional_fn_retrieve__return(uint32_t);
+  probe optional_fn_retrieve__dispatch__complete(char *, uintptr_t);
+  probe optional_fn_retrieve__return(uintptr_t);
   probe post_config__entry();
   probe post_config__dispatch__invoke(char *);
-  probe post_config__dispatch__complete(char *, uint32_t);
-  probe post_config__return(uint32_t);
+  probe post_config__dispatch__complete(char *, uintptr_t);
+  probe post_config__return(uintptr_t);
+  probe post_perdir_config__entry();
+  probe post_perdir_config__dispatch__invoke(char *);
+  probe post_perdir_config__dispatch__complete(char *, uintptr_t);
+  probe post_perdir_config__return(uintptr_t);
   probe post_read_request__entry();
   probe post_read_request__dispatch__invoke(char *);
-  probe post_read_request__dispatch__complete(char *, uint32_t);
-  probe post_read_request__return(uint32_t);
+  probe post_read_request__dispatch__complete(char *, uintptr_t);
+  probe post_read_request__return(uintptr_t);
+  probe pre_read_request__entry();
+  probe pre_read_request__dispatch__invoke(char *);
+  probe pre_read_request__dispatch__complete(char *, uintptr_t);
+  probe pre_read_request__return(uintptr_t);
   probe pre_config__entry();
   probe pre_config__dispatch__invoke(char *);
-  probe pre_config__dispatch__complete(char *, uint32_t);
-  probe pre_config__return(uint32_t);
+  probe pre_config__dispatch__complete(char *, uintptr_t);
+  probe pre_config__return(uintptr_t);
   probe pre_connection__entry();
   probe pre_connection__dispatch__invoke(char *);
-  probe pre_connection__dispatch__complete(char *, uint32_t);
-  probe pre_connection__return(uint32_t);
+  probe pre_connection__dispatch__complete(char *, uintptr_t);
+  probe pre_connection__return(uintptr_t);
   probe pre_mpm__entry();
   probe pre_mpm__dispatch__invoke(char *);
-  probe pre_mpm__dispatch__complete(char *, uint32_t);
-  probe pre_mpm__return(uint32_t);
+  probe pre_mpm__dispatch__complete(char *, uintptr_t);
+  probe pre_mpm__return(uintptr_t);
   probe process_connection__entry();
   probe process_connection__dispatch__invoke(char *);
-  probe process_connection__dispatch__complete(char *, uint32_t);
-  probe process_connection__return(uint32_t);
+  probe process_connection__dispatch__complete(char *, uintptr_t);
+  probe process_connection__return(uintptr_t);
   probe quick_handler__entry();
   probe quick_handler__dispatch__invoke(char *);
-  probe quick_handler__dispatch__complete(char *, uint32_t);
-  probe quick_handler__return(uint32_t);
+  probe quick_handler__dispatch__complete(char *, uintptr_t);
+  probe quick_handler__return(uintptr_t);
   probe test_config__entry();
   probe test_config__dispatch__invoke(char *);
-  probe test_config__dispatch__complete(char *, uint32_t);
-  probe test_config__return(uint32_t);
+  probe test_config__dispatch__complete(char *, uintptr_t);
+  probe test_config__return(uintptr_t);
   probe translate_name__entry();
   probe translate_name__dispatch__invoke(char *);
-  probe translate_name__dispatch__complete(char *, uint32_t);
-  probe translate_name__return(uint32_t);
+  probe translate_name__dispatch__complete(char *, uintptr_t);
+  probe translate_name__return(uintptr_t);
   probe type_checker__entry();
   probe type_checker__dispatch__invoke(char *);
-  probe type_checker__dispatch__complete(char *, uint32_t);
-  probe type_checker__return(uint32_t);
+  probe type_checker__dispatch__complete(char *, uintptr_t);
+  probe type_checker__return(uintptr_t);
 
   /* Implicit, APR hooks for proxy */
   probe canon_handler__entry();
   probe canon_handler__dispatch__invoke(char *);
-  probe canon_handler__dispatch__complete(char *, uint32_t);
-  probe canon_handler__return(uint32_t);
+  probe canon_handler__dispatch__complete(char *, uintptr_t);
+  probe canon_handler__return(uintptr_t);
   probe post_request__entry();
   probe post_request__dispatch__invoke(char *);
-  probe post_request__dispatch__complete(char *, uint32_t);
-  probe post_request__return(uint32_t);
+  probe post_request__dispatch__complete(char *, uintptr_t);
+  probe post_request__return(uintptr_t);
   probe pre_request__entry();
   probe pre_request__dispatch__invoke(char *);
-  probe pre_request__dispatch__complete(char *, uint32_t);
-  probe pre_request__return(uint32_t);
+  probe pre_request__dispatch__complete(char *, uintptr_t);
+  probe pre_request__return(uintptr_t);
   probe scheme_handler__entry();
   probe scheme_handler__dispatch__invoke(char *);
-  probe scheme_handler__dispatch__complete(char *, uint32_t);
-  probe scheme_handler__return(uint32_t);
+  probe scheme_handler__dispatch__complete(char *, uintptr_t);
+  probe scheme_handler__return(uintptr_t);
 
   /* Implicit, APR hooks for dav */
   probe find_liveprop__entry();
   probe find_liveprop__dispatch__invoke(char *);
-  probe find_liveprop__dispatch__complete(char *, uint32_t);
-  probe find_liveprop__return(uint32_t);
+  probe find_liveprop__dispatch__complete(char *, uintptr_t);
+  probe find_liveprop__return(uintptr_t);
   probe gather_propsets__entry();
   probe gather_propsets__dispatch__invoke(char *);
-  probe gather_propsets__dispatch__complete(char *, uint32_t);
-  probe gather_propsets__return(uint32_t);
+  probe gather_propsets__dispatch__complete(char *, uintptr_t);
+  probe gather_propsets__return(uintptr_t);
   probe insert_all_liveprops__entry();
   probe insert_all_liveprops__dispatch__invoke(char *);
-  probe insert_all_liveprops__dispatch__complete(char *, uint32_t);
-  probe insert_all_liveprops__return(uint32_t);
+  probe insert_all_liveprops__dispatch__complete(char *, uintptr_t);
+  probe insert_all_liveprops__return(uintptr_t);
+  probe session_load__entry();
+  probe session_load__dispatch__invoke(char *);
+  probe session_load__dispatch__complete(char *, uintptr_t);
+  probe session_load__return(uintptr_t);
+  probe session_save__entry();
+  probe session_save__dispatch__invoke(char *);
+  probe session_save__dispatch__complete(char *, uintptr_t);
+  probe session_save__return(uintptr_t);
+  probe session_encode__entry();
+  probe session_encode__dispatch__invoke(char *);
+  probe session_encode__dispatch__complete(char *, uintptr_t);
+  probe session_encode__return(uintptr_t);
+  probe session_decode__entry();
+  probe session_decode__dispatch__invoke(char *);
+  probe session_decode__dispatch__complete(char *, uintptr_t);
+  probe session_decode__return(uintptr_t);
 
   /* Implicit, APR hooks for watchdog */
   probe watchdog_exit__entry();
   probe watchdog_exit__dispatch__invoke(char *);
-  probe watchdog_exit__dispatch__complete(char *, uint32_t);
-  probe watchdog_exit__return(uint32_t);
+  probe watchdog_exit__dispatch__complete(char *, uintptr_t);
+  probe watchdog_exit__return(uintptr_t);
   probe watchdog_init__entry();
   probe watchdog_init__dispatch__invoke(char *);
-  probe watchdog_init__dispatch__complete(char *, uint32_t);
-  probe watchdog_init__return(uint32_t);
+  probe watchdog_init__dispatch__complete(char *, uintptr_t);
+  probe watchdog_init__return(uintptr_t);
   probe watchdog_need__entry();
   probe watchdog_need__dispatch__invoke(char *);
-  probe watchdog_need__dispatch__complete(char *, uint32_t);
-  probe watchdog_need__return(uint32_t);
+  probe watchdog_need__dispatch__complete(char *, uintptr_t);
+  probe watchdog_need__return(uintptr_t);
   probe watchdog_step__entry();
   probe watchdog_step__dispatch__invoke(char *);
-  probe watchdog_step__dispatch__complete(char *, uint32_t);
-  probe watchdog_step__return(uint32_t);
+  probe watchdog_step__dispatch__complete(char *, uintptr_t);
+  probe watchdog_step__return(uintptr_t);
 };
--- httpd-2.4.6/build/library.mk	2006-07-12 01:18:15.000000000 +0400
+++ httpd-2.4.6/build/library.mk	2013-11-13 11:53:04.828665670 +0400
@@ -17,6 +17,13 @@ 
 # The build environment was provided by Sascha Schumann.
 
 LTLIBRARY_OBJECTS = $(LTLIBRARY_SOURCES:.c=.lo) $(LTLIBRARY_OBJECTS_X)
+LTLIBRARY_CS = $(LTLIBRARY_SOURCES:%.h=)
+LTLIBRARY_OS = $(LTLIBRARY_CS:.c=.o)
+LTLIBRARY_FP_OS = $(LTLIBRARY_OS:%=$(builddir)/%)
+LIBNAME=$(LTLIBRARY_NAME:.la=.o)
+LIBLIST=$(LTLIBRARY_NAME:.la=.objects)
 
 $(LTLIBRARY_NAME): $(LTLIBRARY_OBJECTS) $(LTLIBRARY_DEPENDENCIES)
 	$(LINK) -static $(LTLIBRARY_LDFLAGS) $(LTLIBRARY_OBJECTS) $(LTLIBRARY_LIBADD)
+	echo $(LTLIBRARY_FP_OS) > $(LIBLIST)
+	ld -r -o $(LIBNAME) $(LTLIBRARY_OS)
--- httpd-2.4.6/configure.in	2013-06-26 17:01:00.000000000 +0400
+++ httpd-2.4.6/configure.in	2013-11-18 15:27:13.852212919 +0400
@@ -539,29 +539,39 @@ 
 AC_ARG_ENABLE(dtrace,APACHE_HELP_STRING(--enable-dtrace,Enable DTrace probes),
 [
   enable_dtrace=$enableval
-  if test "$enableval" = "yes"; then
-    APR_ADDTO(CPPFLAGS, -DAPR_DTRACE_PROVIDER)
-    AC_MSG_ERROR('DTrace Support in the build system is not complete. Patches Welcome!')
-  fi
 ],
 [
   enable_dtrace=no
 ])
 
-dnl Disabled dtrace build for now.
-enable_dtrace=no
-
 case $host in
   *-solaris2*)
     if test $enable_dtrace = "yes" -a "$ac_cv_header_sys_sdt_h" = "yes"; then
-        AC_DEFINE(AP_ENABLE_DTRACE, 1,
-                  [Enable DTrace probes])
-        DTRACE="/usr/sbin/dtrace $DTRACEFLAGS"
-        test -f include/apache_probes.h || $DTRACE -h -s apache_probes.d -o include/apache_probes.h
+        if test -x /usr/sbin/dtrace; then        
+            DTRACE="/usr/sbin/dtrace $DTRACEFLAGS"
+            AC_DEFINE(AP_ENABLE_DTRACE, 1,
+                        [Enable DTrace probes])
+        fi
     fi
     ;;
+  *-linux*)
+    if test $enable_dtrace = "yes" -a "$ac_cv_header_sys_sdt_h" = "yes"; then
+        if test -x /usr/bin/dtrace; then
+            DTRACE="/usr/bin/dtrace $DTRACEFLAGS"        
+            AC_DEFINE(AP_ENABLE_SYSTEMTAP, 1, 
+                      [Define if SystemTap probe definitions are used])
+        fi
+    fi
+    ;;
+  *)
+    enable_dtrace=no
+  ;;
 esac
 
+if test $enable_dtrace = "yes"; then
+    test -f include/apache_probes.h || $DTRACE -h -s apache_probes.d -o include/apache_probes.h
+fi
+
 APACHE_SUBST(DTRACE)
 
 AC_ARG_ENABLE(hook-probes,APACHE_HELP_STRING(--enable-hook-probes,Enable APR hook probes),
--- httpd-2.4.6/include/ap_config.h	2012-08-15 03:59:24.000000000 +0400
+++ httpd-2.4.6/include/ap_config.h	2013-11-18 15:31:25.704210746 +0400
@@ -22,8 +22,6 @@ 
 #ifndef AP_CONFIG_H
 #define AP_CONFIG_H
 
-#include "ap_hooks.h"
-
 /* Although this file doesn't declare any hooks, declare the exports group here */
 /**
  * @defgroup exports Apache exports
@@ -148,17 +146,88 @@ 
 #define AP_NONBLOCK_WHEN_MULTI_LISTEN 1
 #endif
 
-#if defined(AP_ENABLE_DTRACE) && HAVE_SYS_SDT_H
+
+#include "os.h"
+#if (!defined(WIN32) && !defined(NETWARE)) || defined(__MINGW32__)
+#include "ap_config_auto.h"
+#include "ap_config_layout.h"
+#endif
+#if defined(NETWARE)
+#define AP_NONBLOCK_WHEN_MULTI_LISTEN 1
+#endif
+
+/* If APR has OTHER_CHILD logic, use reliable piped logs. */
+#if APR_HAS_OTHER_CHILD
+#define AP_HAVE_RELIABLE_PIPED_LOGS TRUE
+#endif
+
+/* Presume that the compiler supports C99-style designated
+ * initializers if using GCC (but not G++), or for any other compiler
+ * which claims C99 support. */
+#if (defined(__GNUC__) && !defined(__cplusplus))                \
+     || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
+#define AP_HAVE_DESIGNATED_INITIALIZER
+#endif
+
+#if AP_ENABLE_DTRACE || AP_ENABLE_SYSTEMTAP
+
+/* define hook probes before including apr_hooks.h */
+
+#if HAVE_SYS_SDT_H
 #include <sys/sdt.h>
-#else
-#undef _DTRACE_VERSION
 #endif
 
-#ifdef _DTRACE_VERSION
+#define APR_HOOK_PROBES_ENABLED
+
+#undef APR_HOOK_PROBE_ENTRY
+#undef APR_HOOK_PROBE_RETURN
+#undef APR_HOOK_PROBE_INVOKE
+#undef APR_HOOK_PROBE_COMPLETE
+
+/* hard-code provider to "ap" instead of using the hook namespace
+ * so that mod_proxy, mod_dav, and other such hooks with their own
+ * namespace are part of the "ap" provider
+ */
+
+#if AP_ENABLE_SYSTEMTAP
+
+#define APR_HOOK_PROBE_ENTRY(ud,ns,name,args) \
+  STAP_PROBE(ap, name##__entry); ud=NULL
+
+#define APR_HOOK_PROBE_RETURN(ud,ns,name,rv,args) \
+  STAP_PROBE1(ap, name##__return, rv)
+
+#define APR_HOOK_PROBE_INVOKE(ud,ns,name,src,args) \
+  STAP_PROBE1(ap, name##__dispatch__invoke, src)
+
+#define APR_HOOK_PROBE_COMPLETE(ud,ns,name,src,rv,args) \
+  STAP_PROBE2(ap, name##__dispatch__complete, src, rv)
+
+#else
+
+#define APR_HOOK_PROBE_ENTRY(ud,ns,name,args) \
+  __dtrace_ap___##name##__entry(); ud=NULL
+
+#define APR_HOOK_PROBE_RETURN(ud,ns,name,rv,args) \
+  __dtrace_ap___##name##__return(rv)
+
+#define APR_HOOK_PROBE_INVOKE(ud,ns,name,src,args) \
+  __dtrace_ap___##name##__dispatch__invoke(src)
+
+#define APR_HOOK_PROBE_COMPLETE(ud,ns,name,src,rv,args) \
+  __dtrace_ap___##name##__dispatch__complete(src, rv)
+
+#endif
+  
 #include "apache_probes.h"
+
 #else
+
 #include "apache_noprobes.h"
-#endif
+
+#endif /* AP_ENABLE_DTRACE */
+
+#include "ap_hooks.h"
 
 /* If APR has OTHER_CHILD logic, use reliable piped logs. */
 #if APR_HAS_OTHER_CHILD
--- httpd-2.4.6/include/ap_hooks.h	2011-09-23 22:08:42.000000000 +0400
+++ httpd-2.4.6/include/ap_hooks.h	2013-11-13 17:48:25.799844539 +0400
@@ -32,10 +32,6 @@ 
 #define APR_HOOK_PROBES_ENABLED 1
 #endif
 
-#ifdef APR_HOOK_PROBES_ENABLED
-#include "ap_hook_probes.h"
-#endif
-
 #include "apr.h"
 #include "apr_hooks.h"
 #include "apr_optional_hooks.h"
--- httpd-2.4.6/Makefile.in	2012-12-17 15:50:41.000000000 +0400
+++ httpd-2.4.6/Makefile.in	2013-11-14 12:16:50.806402472 +0400
@@ -2,10 +2,18 @@ 
 SUBDIRS = srclib os server modules support
 CLEAN_SUBDIRS = test
 
+MPM_LIB = $(MPM_LIB:.la=.o)
+PROGRAM_DEPENDENCIES_O = $(PROGRAM_DEPENDENCIES:.la=.o)
+PROGRAM_DEPENDENCIES_OBJECTS = $(PROGRAM_DEPENDENCIES:.la=.objects)
+
 PROGRAM_NAME         = $(progname)
 PROGRAM_SOURCES      = modules.c
-PROGRAM_LDADD        = buildmark.o $(HTTPD_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(PCRE_LIBS) $(EXTRA_LIBS) $(AP_LIBS) $(LIBS)
-PROGRAM_PRELINK      = $(COMPILE) -c $(top_srcdir)/server/buildmark.c
+PROGRAM_LDADD        = buildmark.o $(HTTPD_LDFLAGS) `cat $(PROGRAM_DEPENDENCIES_OBJECTS)` \
+			`test -f probes.o && echo probes.o` $(PCRE_LIBS) $(EXTRA_LIBS) $(AP_LIBS) $(LIBS) \
+			`./libtool-dep-extract $(PROGRAM_DEPENDENCIES)`
+PROGRAM_PRELINK      = $(COMPILE) -c $(top_srcdir)/server/buildmark.c && \
+			$(DTRACE) $(DTRACEFLAGS) -G -s apache_probes.d -o probes.o \
+			modules.o buildmark.o `cat $(PROGRAM_DEPENDENCIES_OBJECTS)`
 PROGRAM_DEPENDENCIES = \
   server/libmain.la \
   $(BUILTIN_LIBS) \
@@ -97,6 +105,16 @@ 
 	    fi ; \
 	fi
 
+install-dtrace:
+	@echo Installing DTrace library
+	@$(MKINSTALLDIRS) $(DESTDIR)/usr/lib/dtrace
+	@chown root:sys $(DESTDIR)/usr
+	@chown -R root:bin $(DESTDIR)/usr/lib
+	@chmod -R 0755 $(DESTDIR)/usr
+	@cp $(top_srcdir)/ap.d $(DESTDIR)/usr/lib/dtrace
+	@chown root:bin $(DESTDIR)/usr/lib/dtrace/ap.d
+	@chmod 0644 $(DESTDIR)/usr/lib/dtrace/ap.d
+
 # Create a sanitized config_vars.mk
 build/config_vars.out: build/config_vars.mk
 	@$(SHELL) build/config_vars.sh < build/config_vars.mk > build/config_vars.out
--- httpd-2.4.6/modules/cache/cache_util.h	2013-05-29 01:09:34.000000000 +0400
+++ httpd-2.4.6/modules/cache/cache_util.h	2013-11-13 18:02:32.173851639 +0400
@@ -32,7 +32,7 @@ 
 
 #include "mod_cache.h"
 
-#include "apr_hooks.h"
+#include "ap_config.h"
 #include "apr.h"
 #include "apr_lib.h"
 #include "apr_strings.h"
--- httpd-2.4.6/modules/cache/mod_cache.h	2011-12-03 22:02:24.000000000 +0400
+++ httpd-2.4.6/modules/cache/mod_cache.h	2013-11-13 18:02:32.174851639 +0400
@@ -29,7 +29,7 @@ 
 #include "httpd.h"
 #include "apr_date.h"
 #include "apr_optional.h"
-#include "apr_hooks.h"
+#include "ap_config.h"
 
 #include "cache_common.h"
 
--- httpd-2.4.6/modules/core/mod_watchdog.h	2011-11-30 14:21:09.000000000 +0400
+++ httpd-2.4.6/modules/core/mod_watchdog.h	2013-11-13 18:02:31.411851633 +0400
@@ -36,7 +36,7 @@ 
 #include "apr_pools.h"
 #include "apr_shm.h"
 #include "apr_hash.h"
-#include "apr_hooks.h"
+#include "ap_config.h"
 #include "apr_optional.h"
 #include "apr_file_io.h"
 #include "apr_time.h"
--- httpd-2.4.6/modules/database/mod_dbd.h	2011-09-23 17:38:09.000000000 +0400
+++ httpd-2.4.6/modules/database/mod_dbd.h	2013-11-13 18:02:31.234851631 +0400
@@ -55,7 +55,7 @@ 
 #include <httpd.h>
 #include <apr_optional.h>
 #include <apr_hash.h>
-#include <apr_hooks.h>
+#include <ap_config.h>
 
 typedef struct {
     server_rec *server;
--- httpd-2.4.6/modules/dav/main/mod_dav.h	2013-05-27 00:07:04.000000000 +0400
+++ httpd-2.4.6/modules/dav/main/mod_dav.h	2013-11-13 18:02:31.591851635 +0400
@@ -26,7 +26,7 @@ 
 #ifndef _MOD_DAV_H_
 #define _MOD_DAV_H_
 
-#include "apr_hooks.h"
+#include "ap_config.h"
 #include "apr_hash.h"
 #include "apr_dbm.h"
 #include "apr_tables.h"
--- httpd-2.4.6/modules/filters/config.m4	2012-09-26 18:30:31.000000000 +0400
+++ httpd-2.4.6/modules/filters/config.m4	2013-11-14 13:27:29.379438032 +0400
@@ -20,7 +20,8 @@ 
     if test "x$enable_sed" = "xshared"; then
         # The only symbol which needs to be exported is the module
         # structure, so ask libtool to hide libsed internals:
-        APR_ADDTO(MOD_SED_LDADD, [-export-symbols-regex sed_module])
+        # APR_ADDTO(MOD_SED_LDADD, [-export-symbols-regex sed_module])
+        true
     fi
 ])
 
--- httpd-2.4.6/modules/lua/mod_lua.h	2013-06-10 18:36:56.000000000 +0400
+++ httpd-2.4.6/modules/lua/mod_lua.h	2013-11-13 18:02:31.930851637 +0400
@@ -38,7 +38,7 @@ 
 #include "apr_buckets.h"
 #include "apr_file_info.h"
 #include "apr_time.h"
-#include "apr_hooks.h"
+#include "ap_config.h"
 #include "apr_reslist.h"
 
 /* Allow for Lua 5.2 backwards compatibility */
--- httpd-2.4.6/modules/proxy/ajp.h	2012-01-31 16:04:47.000000000 +0400
+++ httpd-2.4.6/modules/proxy/ajp.h	2013-11-13 18:02:31.777851635 +0400
@@ -29,7 +29,7 @@ 
 #include "apr_version.h"
 #include "apr.h"
 
-#include "apr_hooks.h"
+#include "ap_config.h"
 #include "apr_lib.h"
 #include "apr_strings.h"
 #include "apr_buckets.h"
--- httpd-2.4.6/modules/proxy/mod_proxy.h	2013-07-11 16:21:19.000000000 +0400
+++ httpd-2.4.6/modules/proxy/mod_proxy.h	2013-11-13 18:02:31.732851635 +0400
@@ -26,7 +26,7 @@ 
  * @{
  */
 
-#include "apr_hooks.h"
+#include "ap_config.h"
 #include "apr_optional.h"
 #include "apr.h"
 #include "apr_lib.h"
--- httpd-2.4.6/modules/session/mod_session.h	2011-12-02 21:51:27.000000000 +0400
+++ httpd-2.4.6/modules/session/mod_session.h	2013-11-13 18:02:31.662851635 +0400
@@ -47,7 +47,7 @@ 
  * @{
  */
 
-#include "apr_hooks.h"
+#include "ap_config.h"
 #include "apr_optional.h"
 #include "apr_tables.h"
 #include "apr_uuid.h"
--- httpd-2.4.6/modules/ssl/config.m4	2012-09-26 18:30:31.000000000 +0400
+++ httpd-2.4.6/modules/ssl/config.m4	2013-11-14 13:08:16.285428358 +0400
@@ -43,7 +43,10 @@ 
         if test "x$enable_ssl" = "xshared"; then
            # The only symbol which needs to be exported is the module
            # structure, so ask libtool to hide everything else:
-           APR_ADDTO(MOD_SSL_LDADD, [-export-symbols-regex ssl_module])
+
+           # FIXME: -export-symbols-regex not working on Solaris
+           # APR_ADDTO(MOD_SSL_LDADD, [-export-symbols-regex ssl_module])
+           true
         fi
     else
         enable_ssl=no
--- httpd-2.4.6/server/Makefile.in	2013-01-28 17:13:18.000000000 +0400
+++ httpd-2.4.6/server/Makefile.in	2013-11-13 11:47:49.994663029 +0400
@@ -60,7 +60,7 @@ 
 	  for dir in $(EXPORT_DIRS_APR); do \
 	      ls $$dir/ap[ru].h $$dir/ap[ru]_*.h 2>/dev/null; \
 	  done; \
-	) | sed -e s,//,/,g | sort -u > $@
+	) | sed -e s,//,/,g | sort -u | grep -v apache_probes.h  > $@
 
 exports.c: export_files
 	$(AWK) -f $(top_srcdir)/build/make_exports.awk `cat $?` > $@
--- httpd-2.4.6/server/mpm/event/Makefile.in	2009-11-03 17:36:48.000000000 +0300
+++ httpd-2.4.6/server/mpm/event/Makefile.in	2013-11-14 12:35:01.419411622 +0400
@@ -1, +1,6 @@ 
-include $(top_srcdir)/build/special.mk
+# include $(top_srcdir)/build/special.mk
+
+LTLIBRARY_NAME    = libevent.la
+LTLIBRARY_SOURCES = event.c fdqueue.c pod.c
+
+include $(top_srcdir)/build/ltlib.mk