1
0
mirror of https://github.com/php/php-src.git synced 2026-04-25 08:58:28 +02:00
Commit Graph

907 Commits

Author SHA1 Message Date
Rui Hirokawa f30b722f14 Added conversion support from script character encoding to internal character encoding. This feature is very useful for japanese who uses Shift_JIS encoding because some of characters in Shift_JIS are including '0x5c' and it causes some troubles on Zend parser. This patch is made by Masaki Fujimoto. 2002-05-08 12:33:44 +00:00
Derick Rethans dedf22f5ad - Added Aaron Bannert as maintainer 2002-05-08 05:17:59 +00:00
Edin Kadribasic d00252cf38 Update README with register_argc_argv settings override. 2002-05-06 15:49:06 +00:00
Aaron Bannert 8e176a10fc Fix a graceful restart SEGV. We no longer only perform initialization
on the second pass through the post_config. Now we only avoid the
initialization only on the first DSO load, and on all subsequent loads
we rerun the init code.
2002-05-05 18:15:33 +00:00
Aaron Bannert b759322411 Fix an elusive and intermittent startup SEGV. The problem was
the static string we were using to set an initialization flag
would get remapped to a different location when Apache reloaded
the DSO, causing us to not run our initialization routines.

Submitted by: Justin Erenkrantz <jerenkrantz@apache.org>
Reviewed by: Aaron Bannert (I added the big comment too)
2002-05-05 18:11:41 +00:00
foobar 5f13f4ecb7 Force register_argc_argv=On for CLI 2002-05-05 17:11:04 +00:00
Marko Karppinen b7e50782b7 Well that didn't last long! (Reverting previous.) 2002-05-05 09:52:39 +00:00
Marko Karppinen 32ff990c68 Prelim. patch to enable apache2filter to link on Darwin.
Submitted by: Justin Erenkrantz <jerenkrantz@apache.org>
Reviewed by: markonen
# A stopgap measure while we try to find a "real"
# solution, if one exists.
2002-05-05 09:40:31 +00:00
Sascha Schumann 1ed3f698fe ap_php_optopt is set but never used 2002-05-04 17:27:18 +00:00
Sander Roobol 7a64b2b7e5 Fixed some minor typos 2002-05-02 17:19:42 +00:00
Sebastian Bergmann edba077000 Fix build. 2002-05-02 15:18:26 +00:00
James Cox ba85302e79 updated cgi warning notice. 2002-05-02 14:55:12 +00:00
foobar 2c8e8e0406 Fix build when openssl is enabled. 2002-04-28 04:53:40 +00:00
Sascha Schumann 12ba44827a be a bit more verbose about what is wrong 2002-04-26 21:26:47 +00:00
Sascha Schumann e2ad07fdcf Fix external builds 2002-04-26 10:23:16 +00:00
foobar 492efe963f - Fix for bug: #16791. (more reliable test) 2002-04-26 03:07:16 +00:00
Aaron Bannert b2f9b6fb16 Apache does a full load, unload, load cycle for each DSO module.
This patch makes sure that any startup actions that are performed
for PHP don't happen until the second load (the second call to
the post_config hook), and it also prevents subsequent calls
to the initialization routines.

Suggested By:   Cliff Woolley

PR: 16475, 16754
2002-04-24 00:55:38 +00:00
Hartmut Holzgraefe 4852dd3569 apache_child_terminate() returns status as bool
proto fixes
2002-04-23 11:40:19 +00:00
foobar f54f199906 This was not supposed to be uncommented..yet. 2002-04-23 03:02:20 +00:00
foobar dace2eca03 Part 4 of apache sapi build fixes:
- Fixed many conflicts caused by bogus includes, e.g the infamous XtOffset
  redefinition warning is gone now.
2002-04-23 03:01:30 +00:00
foobar eb18c5c38c Part 3 of static apache build fixes:
- Use the PHP_CFLAGS when compiling the php4 module in apache tree.
- Use the apache include dir only when compiling sapi/apache
  o Fixes the fnmatch.h issue Wez complained about :)
2002-04-23 02:58:54 +00:00
Jim Jagielski a6117a874e Typo in error string 2002-04-22 20:00:41 +00:00
Marko Karppinen 42555b189e Refine the OS X support a bit 2002-04-22 15:37:54 +00:00
Marko Karppinen 2cd85ac084 Merged the Mac OS X compile changes from the Apache 1.3 SAPI.
--with-apxs2 should now work on Mac OS X / Darwin.
# Not tested, though. So shoot me! :)
2002-04-22 15:25:17 +00:00
Edin Kadribasic 6c491a5654 Reverting my previous patch. 2002-04-22 12:00:53 +00:00
Edin Kadribasic 8509772d93 Added ..\..\..\php_build\lib\apache2 to libpath and
..\..\..\php_build\include\apache2 to includepath
2002-04-21 20:36:08 +00:00
Derick Rethans 68ca74c371 - Gaurd for problems in fault servers (fixes problem with Sambar 5.2) 2002-04-18 22:51:23 +00:00
Aaron Bannert 5ab179e830 Document the new PHPINIDir directive in the apache2filter/README. 2002-04-18 22:47:13 +00:00
Aaron Bannert 3aa8a9b62b This patch implements a new Apache2 directive called PHPINIDir that
allows the specification of the php.ini directory from within the Apache
configuration. If left unset, the default is to defer to the hard-coded
php paths. When set, the supplied path is made relative to Apache's
internal ServerRoot setting.

Example:
PHPINIDir "conf"
# PHP will now look in the ServerRoot/conf directory for the php.ini file
2002-04-18 22:10:57 +00:00
Aaron Bannert d11ee7c1ea Fix an intermittent SEGV when an error bubbled up from PHP before our
server context was set. Now if that happens we simply don't log against
any particular server config (vhost).

Obtained from bug report by:  Balazs Nagy <js@iksz.hu>
2002-04-18 16:34:06 +00:00
Aaron Bannert 2e3ce44c80 It makes more sense to do the null-pointer check *before* trying to use it.
(Also fix a typo that Cliff pointed out: "safe" --> "save".)

Obtained from:  Ryan Morgan <rmorgan@covalent.net>
2002-04-16 17:41:28 +00:00
foobar b21931e6c3 ws fixes 2002-04-14 12:38:33 +00:00
foobar 7c2811e1ab Make it possible to actually disable the CLI.. 2002-04-14 03:57:59 +00:00
foobar 0fa1516483 - Prevent users from trying to make a static build with Apache2 using
--with-apache

# I have working --with-apache2 stuff also..need to test it a bit more
# before committing it..
2002-04-13 05:58:29 +00:00
foobar f81166f34e - Added checks to prevent building the DSO with wrong configure option. 2002-04-12 22:59:07 +00:00
Aaron Bannert bf8bb929ac Fix a typo and a build error detected by the lovely HPUX11 ANSI C compiler. 2002-04-12 22:25:29 +00:00
Yasuo Ohgaki 439b56842f CGI/CLI take file and dir for -c option by this.
@ Both 'file' and 'path to php.ini' is allowed for "-c" cli/cgi option. (Yasuo)
2002-04-12 00:20:29 +00:00
Aaron Bannert 22fb507325 Fix a problem where php-generated data was pushed down the entire output
filter chain instead of just down the rest of the chain. This fix will
speed up some unnecessary overhead introduced in the last patch.

Suggested by:  Cliff Woolley <jwoolley@apache.org>
2002-04-11 20:34:56 +00:00
Aaron Bannert 27a5b380cf PHP filters and Apache 2 aren't quite a perfect match yet, so we have
to do some trickery with the server_context to make sure it is always
valid within the current thread.

This patch makes sure the server_context is created in apache's
post_read_request hook phase, and then registeres a cleanup that
will NULL out the server context when the request goes out of scope.
Then, inside the output filters, if the server_context is null we
throw an error. Finally, instead of saving the output filter in
the server_context, now we store the entire request_rec pointer
in there.

POST bodies appear to be working now, although they are very inefficient.
The input filter is still just realloc()ing for whatever data comes
down the input pipe, and then sending this to PHP. This means that
we are doing some really nasty memory management on big POST bodies.
For now this it allows for unlimited input bodies, which means that
a big POST could potentially DoS a box by making it run out of memory.
We might want to put a limit on here just in case, at least until
we figure out how to consume input data more efficiently into php.
2002-04-11 19:25:08 +00:00
Aaron Bannert caf7f3d4d2 Don't depend on the context provided by the filter (f->ctx) anymore. In
Apache 2 the input and output filter contexts are kept unique. We now
only depend on SG(server_context) for each request, and assume that
the same thread will process the entire request. At some point it
would be wise to separate the input and output contexts.
2002-04-11 17:34:17 +00:00
Aaron Bannert d19fd6a0ad Return the number of bytes consumed, not the number of bytes left.
Suggested by:  Brian Havard <brianh@kheldar.apana.org.au>
2002-04-11 17:22:11 +00:00
Sebastian Bergmann bdc27671cd Update README. 2002-04-11 17:01:51 +00:00
Sebastian Bergmann 38af983c80 Patch by Aaron Bannert <aaron@clove.org> and Cliff Woolley <jwoolley@virginia.edu>. 2002-04-11 06:01:54 +00:00
foobar 6958369295 Let people know this stuff is experimental. 2002-04-10 09:42:38 +00:00
Sterling Hughes 53fdf83f09 eekk -- and ssb thought my macro's were icky :) 2002-04-09 17:25:13 +00:00
Sterling Hughes 11acdb097d fix compile warnings 2002-04-09 06:13:00 +00:00
Sebastian Bergmann 777bc9f954 Fix output directory. 2002-04-06 15:45:00 +00:00
Sebastian Bergmann b0eb69ecc0 Fix output directory. 2002-04-06 15:37:08 +00:00
Sebastian Bergmann db840b8001 Fix Debug_TS build. 2002-04-06 08:57:06 +00:00
Wez Furlong abc5a2cacb fix quoting 2002-04-02 16:45:10 +00:00