1
0
mirror of https://github.com/apache/httpd.git synced 2025-11-06 16:49:32 +03:00
Commit Graph

48 Commits

Author SHA1 Message Date
Jim Jagielski
427c85bd23 Cleanup effort in prep for GA push:
Trim trailing whitespace... no func change



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1174751 13f79535-47bb-0310-9956-ffa450edef68
2011-09-23 13:39:32 +00:00
Stefan Fritsch
2014acf62f Improvements found by cppcheck:
remove some unused variables and dead assignments, reduce the scope of some
variables, add some parens to improve readability


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1103459 13f79535-47bb-0310-9956-ffa450edef68
2011-05-15 16:58:45 +00:00
William A. Rowe Jr
4c1dac5e3a Escape should simply close the dialog; Enter should perform the
appropriate button, or within the list, start and stop.  (also
clear up the transitions between the list focus and nonfocus).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@767819 13f79535-47bb-0310-9956-ffa450edef68
2009-04-23 06:48:55 +00:00
William A. Rowe Jr
9b609e2b86 more fallout from removing win9x-model services, this is no longer used
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@731697 13f79535-47bb-0310-9956-ffa450edef68
2009-01-05 20:41:10 +00:00
William A. Rowe Jr
a5f3f9e171 Drop some lingering pre-NT conditionals
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@730895 13f79535-47bb-0310-9956-ffa450edef68
2009-01-03 02:54:03 +00:00
William A. Rowe Jr
1c93462d0b Remove console/win9x support from ApacheMonitor, now Service Control only
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@730894 13f79535-47bb-0310-9956-ffa450edef68
2009-01-03 02:50:09 +00:00
William A. Rowe Jr
ce642c76a7 For legacy VC6, there's no __CRTDECL or _tstoi yet, but the
former is only interesting for ".NET" builds, and the later
is identical to _ttoi (still supported in VC2005, at least).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@652599 13f79535-47bb-0310-9956-ffa450edef68
2008-05-01 18:13:44 +00:00
William A. Rowe Jr
1db11e019e Correct typo in r633607
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@633614 13f79535-47bb-0310-9956-ffa450edef68
2008-03-04 20:06:01 +00:00
William A. Rowe Jr
c005b2a161 Enable UAC transition from ApacheMonitor running as a vanilla user without priv
into a copy runas administrator with permissions (closing the original monitor),
in response to any start/stop/restart request who's control permissions failed.
This happens to work on Win2000 and later, although it is actually needed in 
Win2008 or Vista and later, where by default under UAC, the admin user actually 
has no permissions to control services unless the app is run elevated.  

We don't want to do this at start time, and assault the user with auth attempts
at login before they have even asked to use the features of the Monitor.  Once
we've made the transition, we'll leave the new monitor running elevated.  Some
branding with the "security" shield icon is actually recommended by the CUA, but
I'm neglecting this for the moment.

This patch drops the single instance mutex for a search of existing windows of 
our window's class & title, which is localized to the current session and just fine
for the purpose of restricting multiple invocations.




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@633607 13f79535-47bb-0310-9956-ffa450edef68
2008-03-04 19:44:22 +00:00
William A. Rowe Jr
22b889ef92 A large refactoring, but no behavior change;
replace all relevant ascii strxxx fn's with _tcsxxx macros and encode relevant text
with the _T() macro wrapper, permitting /D UNICODE builds in place of /D _MCBS
builds in use today.  This allows for internationalized unicode service names and
textual modification.  Since this is win32 only, using APR style utf-8-ization is silly.

Because today this module simply isn't loadable on Win95-ME, nobody has actually
complained, and we really have no desire to support such a dangerous OS in the
wild of the internet, the unicode build should become the default.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@632885 13f79535-47bb-0310-9956-ffa450edef68
2008-03-02 23:57:11 +00:00
William A. Rowe Jr
897c00dfc0 Solve service status handle leak on multi-service ApacheMonitor
instances, and disconnect computer function on multi-system
applications of ApacheMonitor.

PR: 33803
Reported by: K.W.Schick <drax sawebs.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@606481 13f79535-47bb-0310-9956-ffa450edef68
2007-12-22 20:00:59 +00:00
William A. Rowe Jr
b99945ec40 Introduce --kill argument to ApacheMonitor for use by the
installer.  This will permit the installation tool to remove
all running instances before attempting to remove the .exe.

Note that since the introduction of CriticalSections, our
compatibility with NT 4 was destroyed, and at this point that
is no loss (there are no more security updates to NT 4 ergo
it's not an OS we want connected to the internet, anyways).
The WTS api calls require 2000 or later, but I'm not wrapping
them since nobody notices the same issue with CriticalSections.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@603238 13f79535-47bb-0310-9956-ffa450edef68
2007-12-11 13:32:40 +00:00
Mladen Turk
08355e91d3 Simplify OS detection. We are only interested in NT
and WIN2K+ (so we can use services.msc)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@557188 13f79535-47bb-0310-9956-ffa450edef68
2007-07-18 08:02:21 +00:00
Mladen Turk
d9438a3939 ApacheMonitor valid OS is any WIN32_NT version.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@556879 13f79535-47bb-0310-9956-ffa450edef68
2007-07-17 10:41:08 +00:00
Mladen Turk
fdd27d85c5 Add detection for post XP operating systems.
Think this can be safely backported to 2.2 and 2.0 branches

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@536052 13f79535-47bb-0310-9956-ffa450edef68
2007-05-08 04:45:54 +00:00
Roy T. Fielding
de659cbed0 update license header text
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@420983 13f79535-47bb-0310-9956-ffa450edef68
2006-07-11 20:33:53 +00:00
Colm MacCarthaigh
dd95d7c37c Update the copyright year in all .c, .h and .xml files
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395228 13f79535-47bb-0310-9956-ffa450edef68
2006-04-19 12:11:27 +00:00
William A. Rowe Jr
66e1bedf58 Quiet warnings of POSIX deprecation in win32 support sources.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@357702 13f79535-47bb-0310-9956-ffa450edef68
2005-12-19 15:05:50 +00:00
Jim Jagielski
5061d9fa92 No functional Change: Removing trailing whitespace. This also
means that "blank" lines consisting of just spaces or
tabs are now really blank lines


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@332306 13f79535-47bb-0310-9956-ffa450edef68
2005-11-10 15:11:44 +00:00
William A. Rowe Jr
56406010b6 httpd and Apache are both anticipated now.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@159627 13f79535-47bb-0310-9956-ffa450edef68
2005-03-31 19:05:11 +00:00
Justin Erenkrantz
905cdf9f0b Update copyright year to 2005 and standardize on current copyright owner line.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@151408 13f79535-47bb-0310-9956-ffa450edef68
2005-02-04 20:28:49 +00:00
Allan K. Edwards
4abcf93fc2 WIN64: fix some windows specific 64bit warnings
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105390 13f79535-47bb-0310-9956-ffa450edef68
2004-10-06 13:33:29 +00:00
André Malo
eeb57c17ad fix name of The Apache Software Foundation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102619 13f79535-47bb-0310-9956-ffa450edef68
2004-02-09 20:40:53 +00:00
André Malo
4f02cb1e18 apply Apache License, Version 2.0
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102525 13f79535-47bb-0310-9956-ffa450edef68
2004-02-06 22:58:42 +00:00
André Malo
fb07607180 update license to 2004.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102135 13f79535-47bb-0310-9956-ffa450edef68
2004-01-01 13:26:26 +00:00
André Malo
742af25096 finished that boring job:
update license to 2003.

Happy New Year! ;-))


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98573 13f79535-47bb-0310-9956-ffa450edef68
2003-02-03 17:53:28 +00:00
William A. Rowe Jr
e233befbcb Use the bare minimum permissions required to perform a given service
manager operation.

Submitted by: David Shane Holden <dpejesh@yahoo.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96036 13f79535-47bb-0310-9956-ffa450edef68
2002-07-12 18:32:27 +00:00
William A. Rowe Jr
6e58d2426e Fix access for non-Administrators (superusers and the like) to allow them
to start and stop services, even without full permission to create or
  remove installed services.

PR: 10460
Submitted by: "Mladen Turk" <mturk@mappingsoft.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95989 13f79535-47bb-0310-9956-ffa450edef68
2002-07-09 17:13:48 +00:00
William A. Rowe Jr
9fe1d41f31 Formating, whitespace, following {} rules, 80 char lines, etc. The only
significant variation from the general Apache rules is the construct:

  switch ()
  {
  case foo:
      case_fns();
  }

  indentation, since win32 switches are very common, but it's impossible
  to follow that rule and maintain legible 80 character line limits.  This
  is a common enough exception that I don't expect vocal objections.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95714 13f79535-47bb-0310-9956-ffa450edef68
2002-06-16 19:02:58 +00:00
William A. Rowe Jr
4d07c89cb1 Don't pass args at StartService, there is no point.
PR:9858
Submitted by:	Mladen Turk <mturk@mappingsoft.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95667 13f79535-47bb-0310-9956-ffa450edef68
2002-06-14 08:04:14 +00:00
William A. Rowe Jr
ddb56aa7da Fix Restart and Stop from the service taskbar list.
PR: 7930
Obtained from:	http://nagoya.apache.org/bugzilla/show_bug.cgi?id=7930
Submitted by:	David Shane Holden <dpejesh@yahoo.com>
Reviewed by:	Mladen Turk, William Rowe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94723 13f79535-47bb-0310-9956-ffa450edef68
2002-04-19 19:19:44 +00:00
Roy T. Fielding
845cbfd508 Update our copyright for this year.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93918 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 20:48:07 +00:00
William A. Rowe Jr
2931ae68e7 Changes by Mladen Turk <mturk@mappingsoft.com>, with dialog touchup by
myself [I can't stand misordered dialog interfaces ;], to allow the user
  to connect and disconnect remote PCs into the ApacheMonitor.

  Needs other mild changes, e.g. machine\service rather than machine@service
  [since @ could be part of a service/machine name, slash and backslash may
  never be.]  And still, the sync behavior leaves something to be desired.
  Note one bug - the browse for computer actually won't browse computers,
  but that can be fixed in another patch.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92191 13f79535-47bb-0310-9956-ffa450edef68
2001-11-27 03:58:41 +00:00
William A. Rowe Jr
59388277e4 Historically consistent flag to shutdown the server [stop is supported,
but only more recently.]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92034 13f79535-47bb-0310-9956-ffa450edef68
2001-11-19 15:27:52 +00:00
William A. Rowe Jr
476c30412a Allow ApacheBench to connect to and control Apache on other WinNT/2K
machines.

Submitted by:	Mladen Turk <mturk@mappingsoft.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91336 13f79535-47bb-0310-9956-ffa450edef68
2001-10-06 18:59:07 +00:00
William A. Rowe Jr
2e0735ce70 Another recent Win32 PSDK addition that we can cover for VC5 users.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91136 13f79535-47bb-0310-9956-ffa450edef68
2001-09-24 22:50:50 +00:00
William A. Rowe Jr
0ef3b7a3a4 Add the red light/green light to ApacheMonitor's popup menu.
[Mladen Turk <mturk@mappingsoft.com>]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90248 13f79535-47bb-0310-9956-ffa450edef68
2001-08-16 22:14:00 +00:00
William A. Rowe Jr
0324327ffb Fix the 'never disappearing' popup menu - anchor it to our (hidden)
global window, which allows TrackPopupMenu to lose focus when any other
  window is selected.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90236 13f79535-47bb-0310-9956-ffa450edef68
2001-08-16 18:12:46 +00:00
William A. Rowe Jr
b56f36bae7 A bit overboard - this registered window message only needs to be
retrieved once


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90234 13f79535-47bb-0310-9956-ffa450edef68
2001-08-16 18:06:30 +00:00
William A. Rowe Jr
9806c6deeb Wipe out some resource leakage.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90233 13f79535-47bb-0310-9956-ffa450edef68
2001-08-16 18:04:39 +00:00
William A. Rowe Jr
4314bb24f3 Revised patch to clean up timer and other issues
Submitted by:	Mladen Turk <mturk@mappingsoft.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90232 13f79535-47bb-0310-9956-ffa450edef68
2001-08-16 17:41:49 +00:00
William A. Rowe Jr
a3def5ed3f Bug fix to the WM_TIMER that was not properly called after it was moved
to WndProc. (The message is WM_TIMER and wParam is timer event)

  Enhancement to left button click which now displays the popup menu with
  all Apache's installed, and to each installed service adds the submenu
  with the options to start, stop or restart the service.

Submitted by:  Mladen Turk <mturk@mappingsoft.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90226 13f79535-47bb-0310-9956-ffa450edef68
2001-08-16 16:51:48 +00:00
William A. Rowe Jr
cc123b33a3 Reorder OS_VERSION(s) so >= OS_VERSION_WINNT, etc, tests correctly.
[Mladen Turk <mladen.turk@mail.inet.hr>]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90204 13f79535-47bb-0310-9956-ffa450edef68
2001-08-16 06:59:53 +00:00
William A. Rowe Jr
b450559e6e . clean up strings and remove them to the resource file (the simplest
way to later localize a win32 app.)

  . fold the timers into the same child window message queue


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90183 13f79535-47bb-0310-9956-ffa450edef68
2001-08-16 02:12:13 +00:00
William A. Rowe Jr
8bc9964900 > 1. Cleaned the ApacheMonitor code a little bit.
> 2. Removed two icons apmall.ico and apsrvmon.ico
> 3. Added option to recognize the Apache*.exe (e.g. Apache-1.3.20.exe)
> 4. Removed AboutBox
> 5. Changed refresh time to 2/20 sec.

Submitted by:	Mladen Turk <mladen.turk@mail.inet.hr>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90160 13f79535-47bb-0310-9956-ffa450edef68
2001-08-14 19:30:21 +00:00
Roy T. Fielding
bc55c103b1 Apache Monitor's tray code does not notify Windows to remove it from the
tray when the process is destroyed. Just needed to add a call to remove
the tray icon before PostQuitMessage(0).

Also show "MS Windows XP" instead of "Whistler".

Submitted by:	Jerry Baker <jerrybaker@weirdness.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90024 13f79535-47bb-0310-9956-ffa450edef68
2001-08-08 02:26:05 +00:00
Cliff Woolley
4c8044a5cd This is a nearly blind commit of an update posted by Mladen Turk just
after the initial import.  Mladen, please check this to see if I got it
right.

Submitted by:	Mladen Turk


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90004 13f79535-47bb-0310-9956-ffa450edef68
2001-08-07 19:54:10 +00:00
William A. Rowe Jr
258b05fab1 The solution for an icon monitor app has arrived :)
Contributed by Mladen Turk <mturk@mappingsoft.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89985 13f79535-47bb-0310-9956-ffa450edef68
2001-08-07 15:51:29 +00:00