1
0
mirror of https://github.com/apache/httpd.git synced 2026-10-28 11:57:22 +03:00
Commit Graph

70 Commits

Author SHA1 Message Date
Jim Jagielski
b72e610410 No functional change: more indenting/formatting changes due to
tabbing


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@332316 13f79535-47bb-0310-9956-ffa450edef68
2005-11-10 16:03:23 +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
Jim Jagielski
5d2fae4818 No functional change: simple detabbing of indented code.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@332305 13f79535-47bb-0310-9956-ffa450edef68
2005-11-10 15:05:51 +00:00
William A. Rowe Jr
fc979108b0 Fix some symbols which should -not- be exported, and decorate real_exit_code
with ap_ (this symbol must be exported.)  If the others were desired to be
  public, they should have been ap_xxx decorated.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@154216 13f79535-47bb-0310-9956-ffa450edef68
2005-02-18 00:00:37 +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
500d117c15 parm cast should be DWORD
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105394 13f79535-47bb-0310-9956-ffa450edef68
2004-10-06 19:40:47 +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
fa66800cdd fix copyright date according to the first check in
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102586 13f79535-47bb-0310-9956-ffa450edef68
2004-02-08 13:49:07 +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
acd5a7e00f Fix -k restart feature on win32.
PR: 12011
Submitted by:	Juan Rivera <Juan.Rivera@citrix.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97216 13f79535-47bb-0310-9956-ffa450edef68
2002-10-14 23:30:01 +00:00
William A. Rowe Jr
ade3b1b4bb Narrow service manager access to what is actually needed to perform
the given operations.

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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95992 13f79535-47bb-0310-9956-ffa450edef68
2002-07-10 02:37:33 +00:00
William A. Rowe Jr
1828aba030 A bit more ap_regkey and apr-ization. Fixes some new bugs where the
AP_REGKEY_CREATE flag wasn't passed for ap_regkey_open (when the key
  is expected to not yet exist), and adds the new flags arg to value_set.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95937 13f79535-47bb-0310-9956-ffa450edef68
2002-07-02 19:03:15 +00:00
William A. Rowe Jr
2d68aebd2a Move the last little useful bit of registry.c into services.c, and
blast it.  All Win32 registry foo is going through ap_regkey now.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95880 13f79535-47bb-0310-9956-ffa450edef68
2002-06-24 07:53:50 +00:00
William A. Rowe Jr
3f18121201 Finish the -w keep-console-open-on-error patch.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95869 13f79535-47bb-0310-9956-ffa450edef68
2002-06-23 10:24:07 +00:00
William A. Rowe Jr
6999dd0cb2 Solve the -k start bug [thanks for the pointers, FirstBill!]
The answer was really trivial.  Unlike all other cases where you
  expect to send argv[0] and get argv[0] in the created process,
  the service control manager (SCM) just don't work like that.

  StartService() argv passed must not include an element zero.
  Element zero is inserted by the SCM, containing the service name,
  without any help from the outside.

  Only reason this bug 'appeared' is that Jeff's patch introduced
  a bit of strictness to refuse arguments without a flag.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95526 13f79535-47bb-0310-9956-ffa450edef68
2002-06-05 15:46:30 +00:00
William A. Rowe Jr
96fb284aca Potential fixes. Patch up the fact that users often expect argv[]s
to be NULL terminated, even though argc should clearly limit the array.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95525 13f79535-47bb-0310-9956-ffa450edef68
2002-06-05 15:14:33 +00:00
Jeff Trawick
c871b41d3c stop using APLOG_NOERRNO in calls to ap_log_?error()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95149 13f79535-47bb-0310-9956-ffa450edef68
2002-05-17 11:11:39 +00:00
William A. Rowe Jr
a43f5c4eb3 Introduced -E startup_logfile_name option to httpd to allow admins
to begin logging errors immediately.  This provides Win32 users
     an alternative to sending startup errors to the event viewer, and
     allows other daemon tool authors an alternative to logging to stderr.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94681 13f79535-47bb-0310-9956-ffa450edef68
2002-04-17 16:36:28 +00:00
Ryan Bloom
ba4014adba Port the -k config option to Apache 2.0. This allows users to reconfigure
their service after it has been installed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94113 13f79535-47bb-0310-9956-ffa450edef68
2002-03-22 01:28:01 +00:00
William A. Rowe Jr
abaf919813 Axe unused variable
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93961 13f79535-47bb-0310-9956-ffa450edef68
2002-03-15 20:34:30 +00:00
William A. Rowe Jr
c46662465d Use fprintf to stderr over printf. Better yet - replace with the
logger, but my brain just isn't quite there tonight.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93929 13f79535-47bb-0310-9956-ffa450edef68
2002-03-14 04:37:14 +00:00
William A. Rowe Jr
f2e2cdcdb8 My [sixth?] major revamp of service.c. Traded an event for a mutex
to the service_init completion, expanded timeouts, moved SERVICE_STOPPED
  message posting to the main thread since sometimes, in odd cirumstances,
  our SCM thread wasn't resumed prior to termination, and ripped the code
  for the stderr logs to use nt_eventlog.c instead.  And generally tried
  to make the code just a little bit more grokable [as if such a thing
  is really possible.]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93928 13f79535-47bb-0310-9956-ffa450edef68
2002-03-14 04:34:03 +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
1e4af39ee0 The final commit to achieve a quality release. We cannot use CreateThread
on Win32 when using the clib; msvcrt has its own initialization and
  destruction, so it needs its own turn.  _createthreadex is the same but
  different - it's implemented by msvcrt and causes all the appropriate
  setup and teardown to occur.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93385 13f79535-47bb-0310-9956-ffa450edef68
2002-02-13 03:33:34 +00:00
William A. Rowe Jr
40eb3b9322 After hours of debugging, the answer was -trivial-, but extremely
obscure and difficult to trace.  This should do away with the handle
  corruption we experienced.  If anyone cares to walk the crt (source
  is installed in vc\src\crt if you install it w/ Visual C++/Studio)
  it's worth understanding why this occured.

  This patch

    1. creates the pipe non-inherited, and dups the write end
       for inheritence with limited permissions.
    2. sets the STD_ERROR_HANDLE _after_ we fixup the FILE *stderr and fd 2.
    3. Splits the signal_monitor event in two, service_init/service_term
       for clarity and correctness.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93374 13f79535-47bb-0310-9956-ffa450edef68
2002-02-12 17:32:06 +00:00
William A. Rowe Jr
34202944a9 Some considerable fixes in sending log messages out to the event log.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93343 13f79535-47bb-0310-9956-ffa450edef68
2002-02-08 19:37:47 +00:00
William A. Rowe Jr
eb1fd4e4b1 Eliminate tons o cruft - we are in another thread - and these can all
be longlived malloced regions, or sit upon the stack.  No need to mess
  with pool conflicts.

  The remaining pool accesses are still a problem to resolve.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93327 13f79535-47bb-0310-9956-ffa450edef68
2002-02-07 06:28:45 +00:00
William A. Rowe Jr
73f8d723dd Upon advice of the FirstBill, I began looking for exceptions that occur
only in the service-mode.  SetServiceDescription was borked, now fixed.
  Since we don't use the posix/libc style stderr, I've also pitched that
  code, which was causing an exception.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93326 13f79535-47bb-0310-9956-ffa450edef68
2002-02-07 00:24:12 +00:00
Bill Stoddard
f5084ba035 Win32: Deprecate ap_start_shutdown/ap_start_restart in favor of ap_signal_parent(enum).
This simplifies the code a bit for some more MPM cleanup work forthcoming.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91529 13f79535-47bb-0310-9956-ffa450edef68
2001-10-17 15:51:22 +00:00
William A. Rowe Jr
1c120280da Solve a symbol from later PlatformSDK's that a VC5 user may or may not
have installed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91134 13f79535-47bb-0310-9956-ffa450edef68
2001-09-24 22:02:14 +00:00
William A. Rowe Jr
6a7efe8552 Add the ImagePath entry for Win9x services [as later 1.3.x versions do].
This is required for any Apache management/monitoring app on Win9x.

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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90278 13f79535-47bb-0310-9956-ffa450edef68
2001-08-17 14:53:50 +00:00
Jeff Trawick
c216c2184a fix some homophonic issues in comments, as well as some
mispelings found near "its" or "it's"

(helping our 4th grader with homework, couldn't help but
grep)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90173 13f79535-47bb-0310-9956-ffa450edef68
2001-08-15 21:11:59 +00:00
William A. Rowe Jr
5812f6c62a Something useful. Update the server description string.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89744 13f79535-47bb-0310-9956-ffa450edef68
2001-07-27 03:48:11 +00:00
Bill Stoddard
1cd0d5dbae Recover from some APR cont --> pool conversions by D. Reid.
Submitted by: Mladen Turk


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89522 13f79535-47bb-0310-9956-ffa450edef68
2001-07-09 14:44:32 +00:00
Jeff Trawick
c8620d7628 this patch removes the warning:
warning C4715: 'mpm_service_install' : not all control paths return a value

it would result in a bogus exit status from apache when invoked to install
the service

Submitted by: Ian Holsman <IanH@cnet.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89129 13f79535-47bb-0310-9956-ffa450edef68
2001-05-16 18:38:36 +00:00
William A. Rowe Jr
15f746172b Clean up some exposed data that should be internal to service.c
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88826 13f79535-47bb-0310-9956-ffa450edef68
2001-04-12 13:58:34 +00:00
William A. Rowe Jr
a93c526298 Address a build problem for VC7.0/PSDK headers identified by
Jerker B�ck <info.jelmar@telia.com>.  This isn't the only
  workaround possible, but IWFM.  VC6/7 users please confirm.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88560 13f79535-47bb-0310-9956-ffa450edef68
2001-03-22 06:01:19 +00:00
Roy T. Fielding
381f88d56a Update copyright to 2001
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88184 13f79535-47bb-0310-9956-ffa450edef68
2001-02-16 04:26:53 +00:00
William A. Rowe Jr
55e28f2bfc Fix Win32 Breakage
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88068 13f79535-47bb-0310-9956-ffa450edef68
2001-02-10 21:57:45 +00:00
Greg Stein
23714288fe *) remove obsolete http_conf_globals.h
*) simplify all this #ifdef'ing: just nuke the unixd.h header. it isn't
   actually needed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88045 13f79535-47bb-0310-9956-ffa450edef68
2001-02-10 03:03:18 +00:00
William A. Rowe Jr
384955c521 This chops the compile time warnings back down to one (a sufficient
reminder that we need some workaround for msvc's broken const'ness.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87170 13f79535-47bb-0310-9956-ffa450edef68
2000-12-04 04:20:39 +00:00
Greg Stein
656a5d3081 Use "const char * const *" for process->argv (which is the correct
const-ness since we sometimes put "some string" in there, and also the CRT's
argv). propagate this change within http_main and mpm/winnt/ (also correct
some other const type usage within the MPM).

fix ab's call to parse_url() which removed a const to actually manipulate an
arg from the CRT's argv (indirectly via opt->arg). no idea how this has
avoided segfaulting.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87130 13f79535-47bb-0310-9956-ffa450edef68
2000-11-29 17:33:03 +00:00
William A. Rowe Jr
86f8525177 John's patches to provide depreciated messages for the -i and -u
options (now -k install|uninstall), and best yet, restart the console
  mode server on Ctrl+Break (Ctrl+C still stops it.)
  At least this is the second half - sorry I missed a bit.

Submitted by:	John Sterling <sterling@covalent.net>
Reviewed by:	William Rowe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86821 13f79535-47bb-0310-9956-ffa450edef68
2000-11-03 04:39:41 +00:00
William A. Rowe Jr
cbd58ab0bd Here it is, the Win32 part of the big canonical errors patch.
The reason is really, really simple.  If we ever choose to mix clib and
  dos error codes, they criss-cross and don't line up, but they share the
  same number space.  As I wrote the new APR_IS_ERROR macros, I realized
  we were about to shoot ourselves in the foot.

  These changes nearly entirely affect Win32 only.  The next big patch will
  affect all of the rv == APR_ENOENT type problems throughout the system.

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86416 13f79535-47bb-0310-9956-ffa450edef68
2000-10-06 17:24:43 +00:00
William A. Rowe Jr
274ac10e33 Downgrade warnings, stop changing errors from something meaningless to
something unrelated, and solve a bug in arg passing.

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86368 13f79535-47bb-0310-9956-ffa450edef68
2000-10-02 22:34:07 +00:00
William A. Rowe Jr
9e74a86486 Adjust the WinNT MPM/SCM code for apr_initopt/apr_getopt; mostly just a
bunch of constness changes.

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86036 13f79535-47bb-0310-9956-ffa450edef68
2000-08-09 14:59:46 +00:00
Doug MacEachern
059d8dd212 prefix libapr functions and types with apr_
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85976 13f79535-47bb-0310-9956-ffa450edef68
2000-08-02 05:27:38 +00:00