evdispatch 0.2.5 → 0.2.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (45) hide show
  1. data/History.txt +3 -0
  2. data/Manifest.txt +32 -32
  3. data/ext/revdispatch/extconf.rb +1 -1
  4. data/ext/revdispatch/libdispatch-0.1/Changelog +1 -0
  5. data/ext/revdispatch/libdispatch-0.1/configure +1 -1
  6. data/ext/revdispatch/libdispatch-0.1/configure.ac +1 -1
  7. data/ext/revdispatch/libdispatch-0.1/{libev-3.2 → libev-3.31}/Changes +24 -0
  8. data/ext/revdispatch/libdispatch-0.1/{libev-3.2 → libev-3.31}/Makefile.in +172 -234
  9. data/ext/revdispatch/libdispatch-0.1/{libev-3.2 → libev-3.31}/aclocal.m4 +6449 -6665
  10. data/ext/revdispatch/libdispatch-0.1/{libev-3.2 → libev-3.31}/autogen.sh +1 -2
  11. data/ext/revdispatch/libdispatch-0.1/{libev-3.2 → libev-3.31}/config.guess +3 -3
  12. data/ext/revdispatch/libdispatch-0.1/{libev-3.2 → libev-3.31}/config.h.in +6 -0
  13. data/ext/revdispatch/libdispatch-0.1/{libev-3.2 → libev-3.31}/config.sub +3 -3
  14. data/ext/revdispatch/libdispatch-0.1/{libev-3.2 → libev-3.31}/configure +496 -783
  15. data/ext/revdispatch/libdispatch-0.1/{libev-3.2 → libev-3.31}/configure.ac +1 -1
  16. data/ext/revdispatch/libdispatch-0.1/{libev-3.2 → libev-3.31}/ev++.h +32 -8
  17. data/ext/revdispatch/libdispatch-0.1/{libev-3.2 → libev-3.31}/ev.3 +91 -23
  18. data/ext/revdispatch/libdispatch-0.1/{libev-3.2 → libev-3.31}/ev.c +119 -22
  19. data/ext/revdispatch/libdispatch-0.1/{libev-3.2 → libev-3.31}/ev.h +59 -37
  20. data/ext/revdispatch/libdispatch-0.1/{libev-3.2 → libev-3.31}/ev.pod +96 -20
  21. data/ext/revdispatch/libdispatch-0.1/{libev-3.2 → libev-3.31}/ev_poll.c +17 -14
  22. data/ext/revdispatch/libdispatch-0.1/{libev-3.2 → libev-3.31}/ev_vars.h +3 -0
  23. data/ext/revdispatch/libdispatch-0.1/{libev-3.2 → libev-3.31}/ev_wrap.h +2 -0
  24. data/ext/revdispatch/libdispatch-0.1/{libev-3.2 → libev-3.31}/event.c +1 -1
  25. data/ext/revdispatch/libdispatch-0.1/{libev-3.2 → libev-3.31}/libev.m4 +2 -2
  26. data/ext/revdispatch/libdispatch-0.1/{libev-3.2 → libev-3.31}/ltmain.sh +92 -151
  27. data/ext/revdispatch/libdispatch-0.1/src/ev_http.cc +11 -6
  28. data/ext/revdispatch/libdispatch-0.1/test/stress_test.cc +1 -1
  29. data/ext/revdispatch/server.rb +11 -23
  30. data/ext/revdispatch/stest.rb +3 -3
  31. data/lib/evdispatch/version.rb +1 -1
  32. data/website/index.html +1 -1
  33. metadata +35 -35
  34. /data/ext/revdispatch/libdispatch-0.1/{libev-3.2 → libev-3.31}/LICENSE +0 -0
  35. /data/ext/revdispatch/libdispatch-0.1/{libev-3.2 → libev-3.31}/Makefile.am +0 -0
  36. /data/ext/revdispatch/libdispatch-0.1/{libev-3.2 → libev-3.31}/README +0 -0
  37. /data/ext/revdispatch/libdispatch-0.1/{libev-3.2 → libev-3.31}/ev_epoll.c +0 -0
  38. /data/ext/revdispatch/libdispatch-0.1/{libev-3.2 → libev-3.31}/ev_kqueue.c +0 -0
  39. /data/ext/revdispatch/libdispatch-0.1/{libev-3.2 → libev-3.31}/ev_port.c +0 -0
  40. /data/ext/revdispatch/libdispatch-0.1/{libev-3.2 → libev-3.31}/ev_select.c +0 -0
  41. /data/ext/revdispatch/libdispatch-0.1/{libev-3.2 → libev-3.31}/ev_win32.c +0 -0
  42. /data/ext/revdispatch/libdispatch-0.1/{libev-3.2 → libev-3.31}/event.h +0 -0
  43. /data/ext/revdispatch/libdispatch-0.1/{libev-3.2 → libev-3.31}/install-sh +0 -0
  44. /data/ext/revdispatch/libdispatch-0.1/{libev-3.2 → libev-3.31}/missing +0 -0
  45. /data/ext/revdispatch/libdispatch-0.1/{libev-3.2 → libev-3.31}/mkinstalldirs +0 -0
@@ -1,8 +1,8 @@
1
1
  # ltmain.sh - Provide generalized library-building support services.
2
2
  # NOTE: Changing this file will not affect anything until you rerun configure.
3
3
  #
4
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
5
- # 2007 Free Software Foundation, Inc.
4
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
5
+ # Free Software Foundation, Inc.
6
6
  # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
7
7
  #
8
8
  # This program is free software; you can redistribute it and/or modify
@@ -43,22 +43,14 @@ EXIT_FAILURE=1
43
43
 
44
44
  PROGRAM=ltmain.sh
45
45
  PACKAGE=libtool
46
- VERSION=1.5.24
47
- TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
48
-
49
- # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
50
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
51
- emulate sh
52
- NULLCMD=:
53
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
54
- # is contrary to our usage. Disable this feature.
55
- alias -g '${1+"$@"}'='"$@"'
46
+ VERSION="1.5.22 Debian 1.5.22-4"
47
+ TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
48
+
49
+ # See if we are running on zsh, and set the options which allow our
50
+ # commands through without removal of \ escapes.
51
+ if test -n "${ZSH_VERSION+set}" ; then
56
52
  setopt NO_GLOB_SUBST
57
- else
58
- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
59
53
  fi
60
- BIN_SH=xpg4; export BIN_SH # for Tru64
61
- DUALCASE=1; export DUALCASE # for MKS sh
62
54
 
63
55
  # Check that we have a working $echo.
64
56
  if test "X$1" = X--no-reexec; then
@@ -113,14 +105,12 @@ esac
113
105
  # These must not be set unconditionally because not all systems understand
114
106
  # e.g. LANG=C (notably SCO).
115
107
  # We save the old values to restore during execute mode.
116
- for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
117
- do
118
- eval "if test \"\${$lt_var+set}\" = set; then
119
- save_$lt_var=\$$lt_var
120
- $lt_var=C
121
- export $lt_var
122
- fi"
123
- done
108
+ if test "${LC_ALL+set}" = set; then
109
+ save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
110
+ fi
111
+ if test "${LANG+set}" = set; then
112
+ save_LANG="$LANG"; LANG=C; export LANG
113
+ fi
124
114
 
125
115
  # Make sure IFS has a sensible default
126
116
  lt_nl='
@@ -146,8 +136,6 @@ duplicate_deps=no
146
136
  preserve_args=
147
137
  lo2o="s/\\.lo\$/.${objext}/"
148
138
  o2lo="s/\\.${objext}\$/.lo/"
149
- extracted_archives=
150
- extracted_serial=0
151
139
 
152
140
  #####################################
153
141
  # Shell function definitions:
@@ -208,13 +196,7 @@ func_win32_libid ()
208
196
  if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
209
197
  $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
210
198
  win32_nmres=`eval $NM -f posix -A $1 | \
211
- $SED -n -e '1,100{
212
- / I /{
213
- s,.*,import,
214
- p
215
- q
216
- }
217
- }'`
199
+ $SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
218
200
  case $win32_nmres in
219
201
  import*) win32_libid_type="x86 archive import";;
220
202
  *) win32_libid_type="x86 archive static";;
@@ -345,17 +327,7 @@ func_extract_archives ()
345
327
  *) my_xabs=`pwd`"/$my_xlib" ;;
346
328
  esac
347
329
  my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
348
- my_xlib_u=$my_xlib
349
- while :; do
350
- case " $extracted_archives " in
351
- *" $my_xlib_u "*)
352
- extracted_serial=`expr $extracted_serial + 1`
353
- my_xlib_u=lt$extracted_serial-$my_xlib ;;
354
- *) break ;;
355
- esac
356
- done
357
- extracted_archives="$extracted_archives $my_xlib_u"
358
- my_xdir="$my_gentop/$my_xlib_u"
330
+ my_xdir="$my_gentop/$my_xlib"
359
331
 
360
332
  $show "${rm}r $my_xdir"
361
333
  $run ${rm}r "$my_xdir"
@@ -482,12 +454,11 @@ do
482
454
  ;;
483
455
 
484
456
  --version)
485
- echo "\
486
- $PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
487
-
488
- Copyright (C) 2007 Free Software Foundation, Inc.
489
- This is free software; see the source for copying conditions. There is NO
490
- warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
457
+ $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
458
+ $echo
459
+ $echo "Copyright (C) 2005 Free Software Foundation, Inc."
460
+ $echo "This is free software; see the source for copying conditions. There is NO"
461
+ $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
491
462
  exit $?
492
463
  ;;
493
464
 
@@ -784,10 +755,9 @@ if test -z "$show_help"; then
784
755
  *.class) xform=class ;;
785
756
  *.cpp) xform=cpp ;;
786
757
  *.cxx) xform=cxx ;;
787
- *.[fF][09]?) xform=[fF][09]. ;;
758
+ *.f90) xform=f90 ;;
788
759
  *.for) xform=for ;;
789
760
  *.java) xform=java ;;
790
- *.obj) xform=obj ;;
791
761
  esac
792
762
 
793
763
  libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
@@ -1168,9 +1138,8 @@ EOF
1168
1138
  for arg
1169
1139
  do
1170
1140
  case $arg in
1171
- -all-static | -static | -static-libtool-libs)
1172
- case $arg in
1173
- -all-static)
1141
+ -all-static | -static)
1142
+ if test "X$arg" = "X-all-static"; then
1174
1143
  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
1175
1144
  $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
1176
1145
  fi
@@ -1178,20 +1147,12 @@ EOF
1178
1147
  dlopen_self=$dlopen_self_static
1179
1148
  fi
1180
1149
  prefer_static_libs=yes
1181
- ;;
1182
- -static)
1150
+ else
1183
1151
  if test -z "$pic_flag" && test -n "$link_static_flag"; then
1184
1152
  dlopen_self=$dlopen_self_static
1185
1153
  fi
1186
1154
  prefer_static_libs=built
1187
- ;;
1188
- -static-libtool-libs)
1189
- if test -z "$pic_flag" && test -n "$link_static_flag"; then
1190
- dlopen_self=$dlopen_self_static
1191
- fi
1192
- prefer_static_libs=yes
1193
- ;;
1194
- esac
1155
+ fi
1195
1156
  build_libtool_libs=no
1196
1157
  build_old_libs=yes
1197
1158
  break
@@ -1639,7 +1600,7 @@ EOF
1639
1600
  continue
1640
1601
  ;;
1641
1602
 
1642
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
1603
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
1643
1604
  compiler_flags="$compiler_flags $arg"
1644
1605
  compile_command="$compile_command $arg"
1645
1606
  finalize_command="$finalize_command $arg"
@@ -1659,11 +1620,10 @@ EOF
1659
1620
  # -m* pass through architecture-specific compiler args for GCC
1660
1621
  # -m*, -t[45]*, -txscale* pass through architecture-specific
1661
1622
  # compiler args for GCC
1662
- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
1663
- # -F/path gives path to uninstalled frameworks, gcc on darwin
1623
+ # -pg pass through profiling flag for GCC
1664
1624
  # @file GCC response files
1665
- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
1666
- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
1625
+ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
1626
+ -t[45]*|-txscale*|@*)
1667
1627
 
1668
1628
  # Unknown arguments in both finalize_command and compile_command need
1669
1629
  # to be aesthetically quoted because they are evaled later.
@@ -1691,9 +1651,9 @@ EOF
1691
1651
 
1692
1652
  -no-install)
1693
1653
  case $host in
1694
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
1654
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
1695
1655
  # The PATH hackery in wrapper scripts is required on Windows
1696
- # and Darwin in order for the loader to find any dlls it needs.
1656
+ # in order for the loader to find any dlls it needs.
1697
1657
  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
1698
1658
  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
1699
1659
  fast_install=no
@@ -1752,7 +1712,7 @@ EOF
1752
1712
  continue
1753
1713
  ;;
1754
1714
 
1755
- -static | -static-libtool-libs)
1715
+ -static)
1756
1716
  # The effects of -static are defined in a previous loop.
1757
1717
  # We used to do the same as -all-static on platforms that
1758
1718
  # didn't have a PIC flag, but the assumption that the effects
@@ -2122,7 +2082,10 @@ EOF
2122
2082
  case $pass in
2123
2083
  dlopen) libs="$dlfiles" ;;
2124
2084
  dlpreopen) libs="$dlprefiles" ;;
2125
- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
2085
+ link)
2086
+ libs="$deplibs %DEPLIBS%"
2087
+ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
2088
+ ;;
2126
2089
  esac
2127
2090
  fi
2128
2091
  if test "$pass" = dlopen; then
@@ -2134,7 +2097,7 @@ EOF
2134
2097
  lib=
2135
2098
  found=no
2136
2099
  case $deplib in
2137
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
2100
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
2138
2101
  if test "$linkmode,$pass" = "prog,link"; then
2139
2102
  compile_deplibs="$deplib $compile_deplibs"
2140
2103
  finalize_deplibs="$deplib $finalize_deplibs"
@@ -2530,9 +2493,7 @@ EOF
2530
2493
 
2531
2494
  if test "$linkmode,$pass" = "prog,link"; then
2532
2495
  if test -n "$library_names" &&
2533
- { { test "$prefer_static_libs" = no ||
2534
- test "$prefer_static_libs,$installed" = "built,yes"; } ||
2535
- test -z "$old_library"; }; then
2496
+ { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
2536
2497
  # We need to hardcode the library path
2537
2498
  if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
2538
2499
  # Make sure the rpath contains only unique directories.
@@ -3228,7 +3189,7 @@ EOF
3228
3189
  # which has an extra 1 added just for fun
3229
3190
  #
3230
3191
  case $version_type in
3231
- darwin|linux|osf|windows|none)
3192
+ darwin|linux|osf|windows)
3232
3193
  current=`expr $number_major + $number_minor`
3233
3194
  age="$number_minor"
3234
3195
  revision="$number_revision"
@@ -3239,10 +3200,14 @@ EOF
3239
3200
  age="0"
3240
3201
  ;;
3241
3202
  irix|nonstopux)
3242
- current=`expr $number_major + $number_minor`
3203
+ current=`expr $number_major + $number_minor - 1`
3243
3204
  age="$number_minor"
3244
3205
  revision="$number_minor"
3245
- lt_irix_increment=no
3206
+ ;;
3207
+ *)
3208
+ $echo "$modename: unknown library version type \`$version_type'" 1>&2
3209
+ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
3210
+ exit $EXIT_FAILURE
3246
3211
  ;;
3247
3212
  esac
3248
3213
  ;;
@@ -3301,8 +3266,7 @@ EOF
3301
3266
  versuffix="$major.$age.$revision"
3302
3267
  # Darwin ld doesn't like 0 for these options...
3303
3268
  minor_current=`expr $current + 1`
3304
- xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
3305
- verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
3269
+ verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
3306
3270
  ;;
3307
3271
 
3308
3272
  freebsd-aout)
@@ -3316,11 +3280,8 @@ EOF
3316
3280
  ;;
3317
3281
 
3318
3282
  irix | nonstopux)
3319
- if test "X$lt_irix_increment" = "Xno"; then
3320
- major=`expr $current - $age`
3321
- else
3322
- major=`expr $current - $age + 1`
3323
- fi
3283
+ major=`expr $current - $age + 1`
3284
+
3324
3285
  case $version_type in
3325
3286
  nonstopux) verstring_prefix=nonstopux ;;
3326
3287
  *) verstring_prefix=sgi ;;
@@ -3457,11 +3418,11 @@ EOF
3457
3418
  fi
3458
3419
 
3459
3420
  # Eliminate all temporary directories.
3460
- #for path in $notinst_path; do
3461
- # lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
3462
- # deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
3463
- # dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
3464
- #done
3421
+ for path in $notinst_path; do
3422
+ lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
3423
+ deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
3424
+ dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
3425
+ done
3465
3426
 
3466
3427
  if test -n "$xrpath"; then
3467
3428
  # If the user specified any rpath flags, then add them.
@@ -3562,12 +3523,13 @@ EOF
3562
3523
  int main() { return 0; }
3563
3524
  EOF
3564
3525
  $rm conftest
3565
- if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
3526
+ $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
3527
+ if test "$?" -eq 0 ; then
3566
3528
  ldd_output=`ldd conftest`
3567
3529
  for i in $deplibs; do
3568
3530
  name=`expr $i : '-l\(.*\)'`
3569
3531
  # If $name is empty we are operating on a -L argument.
3570
- if test "$name" != "" && test "$name" != "0"; then
3532
+ if test "$name" != "" && test "$name" -ne "0"; then
3571
3533
  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
3572
3534
  case " $predeps $postdeps " in
3573
3535
  *" $i "*)
@@ -3606,7 +3568,9 @@ EOF
3606
3568
  # If $name is empty we are operating on a -L argument.
3607
3569
  if test "$name" != "" && test "$name" != "0"; then
3608
3570
  $rm conftest
3609
- if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
3571
+ $LTCC $LTCFLAGS -o conftest conftest.c $i
3572
+ # Did it work?
3573
+ if test "$?" -eq 0 ; then
3610
3574
  ldd_output=`ldd conftest`
3611
3575
  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
3612
3576
  case " $predeps $postdeps " in
@@ -3638,7 +3602,7 @@ EOF
3638
3602
  droppeddeps=yes
3639
3603
  $echo
3640
3604
  $echo "*** Warning! Library $i is needed by this library but I was not able to"
3641
- $echo "*** make it link in! You will probably need to install it or some"
3605
+ $echo "*** make it link in! You will probably need to install it or some"
3642
3606
  $echo "*** library that it depends on before this library will be fully"
3643
3607
  $echo "*** functional. Installing it before continuing would be even better."
3644
3608
  fi
@@ -3924,10 +3888,7 @@ EOF
3924
3888
  test -n "$hardcode_libdirs"; then
3925
3889
  libdir="$hardcode_libdirs"
3926
3890
  if test -n "$hardcode_libdir_flag_spec_ld"; then
3927
- case $archive_cmds in
3928
- *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
3929
- *) eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
3930
- esac
3891
+ eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
3931
3892
  else
3932
3893
  eval dep_rpath=\"$hardcode_libdir_flag_spec\"
3933
3894
  fi
@@ -4286,14 +4247,12 @@ EOF
4286
4247
  reload_conv_objs=
4287
4248
  gentop=
4288
4249
  # reload_cmds runs $LD directly, so let us get rid of
4289
- # -Wl from whole_archive_flag_spec and hope we can get by with
4290
- # turning comma into space..
4250
+ # -Wl from whole_archive_flag_spec
4291
4251
  wl=
4292
4252
 
4293
4253
  if test -n "$convenience"; then
4294
4254
  if test -n "$whole_archive_flag_spec"; then
4295
- eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
4296
- reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
4255
+ eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
4297
4256
  else
4298
4257
  gentop="$output_objdir/${obj}x"
4299
4258
  generated="$generated $gentop"
@@ -4741,16 +4700,16 @@ static const void *lt_preloaded_setup() {
4741
4700
  case $host in
4742
4701
  *cygwin* | *mingw* )
4743
4702
  if test -f "$output_objdir/${outputname}.def" ; then
4744
- compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
4745
- finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
4703
+ compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
4704
+ finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
4746
4705
  else
4747
- compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
4748
- finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
4706
+ compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
4707
+ finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
4749
4708
  fi
4750
4709
  ;;
4751
4710
  * )
4752
- compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
4753
- finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
4711
+ compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
4712
+ finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
4754
4713
  ;;
4755
4714
  esac
4756
4715
  ;;
@@ -4765,13 +4724,13 @@ static const void *lt_preloaded_setup() {
4765
4724
  # really was required.
4766
4725
 
4767
4726
  # Nullify the symbol file.
4768
- compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
4769
- finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
4727
+ compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
4728
+ finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
4770
4729
  fi
4771
4730
 
4772
4731
  if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
4773
4732
  # Replace the output file specification.
4774
- compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
4733
+ compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
4775
4734
  link_command="$compile_command$compile_rpath"
4776
4735
 
4777
4736
  # We have no uninstalled library dependencies, so finalize right now.
@@ -4858,7 +4817,7 @@ static const void *lt_preloaded_setup() {
4858
4817
  if test "$fast_install" != no; then
4859
4818
  link_command="$finalize_var$compile_command$finalize_rpath"
4860
4819
  if test "$fast_install" = yes; then
4861
- relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
4820
+ relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
4862
4821
  else
4863
4822
  # fast_install is set to needless
4864
4823
  relink_command=
@@ -4895,7 +4854,7 @@ static const void *lt_preloaded_setup() {
4895
4854
  fi
4896
4855
  done
4897
4856
  relink_command="(cd `pwd`; $relink_command)"
4898
- relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
4857
+ relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
4899
4858
  fi
4900
4859
 
4901
4860
  # Quote $echo for shipping.
@@ -5302,20 +5261,6 @@ EOF
5302
5261
  Xsed='${SED} -e 1s/^X//'
5303
5262
  sed_quote_subst='$sed_quote_subst'
5304
5263
 
5305
- # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
5306
- if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
5307
- emulate sh
5308
- NULLCMD=:
5309
- # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
5310
- # is contrary to our usage. Disable this feature.
5311
- alias -g '\${1+\"\$@\"}'='\"\$@\"'
5312
- setopt NO_GLOB_SUBST
5313
- else
5314
- case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
5315
- fi
5316
- BIN_SH=xpg4; export BIN_SH # for Tru64
5317
- DUALCASE=1; export DUALCASE # for MKS sh
5318
-
5319
5264
  # The HP-UX ksh and POSIX shell print the target directory to stdout
5320
5265
  # if CDPATH is set.
5321
5266
  (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
@@ -5458,7 +5403,7 @@ else
5458
5403
  ;;
5459
5404
  esac
5460
5405
  $echo >> $output "\
5461
- \$echo \"\$0: cannot exec \$program \$*\"
5406
+ \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
5462
5407
  exit $EXIT_FAILURE
5463
5408
  fi
5464
5409
  else
@@ -5644,7 +5589,7 @@ fi\
5644
5589
  done
5645
5590
  # Quote the link command for shipping.
5646
5591
  relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
5647
- relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
5592
+ relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
5648
5593
  if test "$hardcode_automatic" = yes ; then
5649
5594
  relink_command=
5650
5595
  fi
@@ -5989,9 +5934,9 @@ relink_command=\"$relink_command\""
5989
5934
 
5990
5935
  if test -n "$inst_prefix_dir"; then
5991
5936
  # Stick the inst_prefix_dir data into the link command.
5992
- relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
5937
+ relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
5993
5938
  else
5994
- relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
5939
+ relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
5995
5940
  fi
5996
5941
 
5997
5942
  $echo "$modename: warning: relinking \`$file'" 1>&2
@@ -6200,7 +6145,7 @@ relink_command=\"$relink_command\""
6200
6145
  file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
6201
6146
  outputname="$tmpdir/$file"
6202
6147
  # Replace the output file specification.
6203
- relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
6148
+ relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
6204
6149
 
6205
6150
  $show "$relink_command"
6206
6151
  if $run eval "$relink_command"; then :
@@ -6411,10 +6356,8 @@ relink_command=\"$relink_command\""
6411
6356
  if test -f "$dir/$objdir/$dlname"; then
6412
6357
  dir="$dir/$objdir"
6413
6358
  else
6414
- if test ! -f "$dir/$dlname"; then
6415
- $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
6416
- exit $EXIT_FAILURE
6417
- fi
6359
+ $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
6360
+ exit $EXIT_FAILURE
6418
6361
  fi
6419
6362
  ;;
6420
6363
 
@@ -6478,12 +6421,12 @@ relink_command=\"$relink_command\""
6478
6421
  fi
6479
6422
 
6480
6423
  # Restore saved environment variables
6481
- for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
6482
- do
6483
- eval "if test \"\${save_$lt_var+set}\" = set; then
6484
- $lt_var=\$save_$lt_var; export $lt_var
6485
- fi"
6486
- done
6424
+ if test "${save_LC_ALL+set}" = set; then
6425
+ LC_ALL="$save_LC_ALL"; export LC_ALL
6426
+ fi
6427
+ if test "${save_LANG+set}" = set; then
6428
+ LANG="$save_LANG"; export LANG
6429
+ fi
6487
6430
 
6488
6431
  # Now prepare to actually exec the command.
6489
6432
  exec_cmd="\$cmd$args"
@@ -6840,9 +6783,9 @@ The following components of LINK-COMMAND are treated specially:
6840
6783
  -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
6841
6784
  -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
6842
6785
  -export-symbols SYMFILE
6843
- try to export only the symbols listed in SYMFILE
6786
+ try to export only the symbols listed in SYMFILE
6844
6787
  -export-symbols-regex REGEX
6845
- try to export only the symbols matching REGEX
6788
+ try to export only the symbols matching REGEX
6846
6789
  -LLIBDIR search LIBDIR for required installed libraries
6847
6790
  -lNAME OUTPUT-FILE requires the installed library libNAME
6848
6791
  -module build a library that can dlopened
@@ -6856,11 +6799,9 @@ The following components of LINK-COMMAND are treated specially:
6856
6799
  -release RELEASE specify package release information
6857
6800
  -rpath LIBDIR the created library will eventually be installed in LIBDIR
6858
6801
  -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
6859
- -static do not do any dynamic linking of uninstalled libtool libraries
6860
- -static-libtool-libs
6861
- do not do any dynamic linking of libtool libraries
6802
+ -static do not do any dynamic linking of libtool libraries
6862
6803
  -version-info CURRENT[:REVISION[:AGE]]
6863
- specify library version info [each variable defaults to 0]
6804
+ specify library version info [each variable defaults to 0]
6864
6805
 
6865
6806
  All other options (arguments beginning with \`-') are ignored.
6866
6807
 
@@ -23,7 +23,7 @@ static void multi_error_report(CURLMcode rc)
23
23
  printf("curlm:perform: %s\n", curl_multi_strerror(rc) );
24
24
  break;
25
25
  case CURLM_OK:
26
- // printf("curlm:ok\n");
26
+ //printf("curlm:ok\n");
27
27
  break;
28
28
  case CURLM_BAD_HANDLE:
29
29
  printf("curlm:bad handle: %s\n", curl_multi_strerror(rc) );
@@ -34,7 +34,7 @@ static void multi_error_report(CURLMcode rc)
34
34
  case CURLM_OUT_OF_MEMORY:
35
35
  printf("curlm:oh shit out of memory: %s\n", curl_multi_strerror(rc) );
36
36
  break;
37
- case CURLM_INTERNAL_ERROR:
37
+ //case CURLM_INTERNAL_ERROR:
38
38
  printf("curlm:oh shit internal error: %s\n", curl_multi_strerror(rc) );
39
39
  break;
40
40
  case CURLM_BAD_SOCKET:
@@ -103,7 +103,7 @@ int HttpClient::sock_cb(CURL *e, curl_socket_t sock, int action, void *cbp, void
103
103
  switch( action ){
104
104
  case CURL_POLL_REMOVE: // (4) unregister
105
105
  // make sure we clear it out
106
- //printf( " del sock: 0x%X\n", sockinfo );
106
+ // printf( " del sock: 0x%X\n", sockinfo );
107
107
  curl_multi_assign(client->m_handle, sock, NULL);
108
108
  sockinfo->finish();
109
109
  delete sockinfo;
@@ -119,6 +119,7 @@ int HttpClient::sock_cb(CURL *e, curl_socket_t sock, int action, void *cbp, void
119
119
  case CURL_POLL_INOUT: // (3) register, interested in both read and write readiness
120
120
  // printf("inout\n");
121
121
  default:
122
+ // printf("set action: %d\n", action );
122
123
  sockinfo->set_sock( sock, e, action );
123
124
  client->check_handles();
124
125
  break;
@@ -317,10 +318,12 @@ bool HttpRequest::enable()
317
318
  rc = curl_multi_socket_all( m_client->m_handle, &m_client->m_active );
318
319
  } while( rc == CURLM_CALL_MULTI_PERFORM && m_client );
319
320
  }
320
- // XXX: it's really strange that m_client could be 0x0 all of a sudden here... but that's currently what must be happening
321
- // in order for the final return code to be CURLM_CALL_MULTI_PERFORM.
322
321
  if( m_client ) {
323
322
  m_client->check_handles();
323
+ }else {
324
+ // XXX: it's really strange that m_client could be 0x0 all of a sudden here... but that's currently what must be happening
325
+ // in order for the final return code to be CURLM_CALL_MULTI_PERFORM.
326
+ printf("m_client went 0x0\n");
324
327
  }
325
328
  multi_error_report(rc);
326
329
  return (rc == CURLM_OK || rc == CURLM_CALL_MULTI_PERFORM);
@@ -372,14 +375,16 @@ void HttpRequest::set_opt( const std::string &key, const std::string &value )
372
375
  }
373
376
  else if( val_type >= CURLOPTTYPE_OBJECTPOINT && val_type < CURLOPTTYPE_FUNCTIONPOINT ) {
374
377
  if( key == "post" ) {
375
- printf( "set %s as str, with value: %s\n", key.c_str(), value.c_str() );
378
+ // printf( "set %s as str, with value: %s\n", key.c_str(), value.c_str() );
376
379
  // enable HTTP POST
377
380
  curl_easy_setopt( m_handle, CURLOPT_POST, 1 );
378
381
  // set the buffer size to copy
379
382
  curl_easy_setopt( m_handle, CURLOPT_POSTFIELDSIZE, value.length() );
383
+ curl_easy_setopt( m_handle, CURLOPT_POSTFIELDS, value.c_str() );
380
384
  // copy the buffer
381
385
  curl_easy_setopt( m_handle, CURLOPT_COPYPOSTFIELDS, value.c_str() );
382
386
  // printf("setup easy handle to perform a post\n");
387
+ // curl_easy_setopt( m_handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0 );
383
388
  }
384
389
  else {
385
390
  curl_easy_setopt( m_handle, val_type, value.c_str() );
@@ -19,7 +19,7 @@ static int run_test(Dispatch& dispatcher)
19
19
 
20
20
  printf( "dispatcher thread running...\n" );
21
21
  std::vector<request_t> ids;
22
- int TRIALS = 10;
22
+ int TRIALS = 100;
23
23
 
24
24
  for( int i = 0; i < TRIALS; ++i ) {
25
25
  request_t id;
@@ -1,13 +1,16 @@
1
1
  require 'rubygems'
2
- require 'ebb'
3
-
4
- Ebb.log = File.open('/dev/null','w')
2
+ require 'rack'
5
3
 
6
4
  TEST_PORT = 4044
7
5
 
8
6
  $req_count = 0
9
7
 
10
- class HelperApp
8
+ class TestApp
9
+
10
+ def initialize
11
+ puts "Test server '#{__FILE__}', started"
12
+ end
13
+
11
14
  def call(env)
12
15
  commands = env['PATH_INFO'].split('/')
13
16
  extras = {}
@@ -40,8 +43,8 @@ class HelperApp
40
43
  elsif commands.include?('test_post_length')
41
44
  input_body = env['rack.input'].read
42
45
 
43
- content_length_header = env['HTTP_CONTENT_LENGTH'].to_i
44
-
46
+ content_length_header = env['CONTENT_LENGTH'].to_i
47
+
45
48
  if content_length_header == input_body.length
46
49
  body = "Content-Length matches input length"
47
50
  status = 200
@@ -58,20 +61,5 @@ class HelperApp
58
61
  [status, {'Content-Type' => 'text/json'}.merge(extras), body]
59
62
  end
60
63
  end
61
-
62
- def start_test_server
63
- puts "starting up ebb";
64
- Thread.start{ Ebb.start_server(HelperApp.new, :port => TEST_PORT) }
65
- sleep 0.1 until Ebb.running?
66
-
67
- Signal.trap( "HUP" ){
68
- Ebb.stop_server
69
- sleep 0.1 while Ebb.running?
70
- }
71
-
72
- # keep process alive
73
- sleep 0.5 while Ebb.running?
74
- end
75
- if( ARGV[0] == "start" )
76
- start_test_server
77
- end
64
+
65
+ Rack::Handler::Mongrel.run( Rack::ShowExceptions.new(Rack::Lint.new(TestApp.new)), :Port => TEST_PORT )