Commit Graph

699 Commits

Author SHA1 Message Date
Zeev Suraski
dde79b86c5 Build fix 2001-07-28 12:05:15 +00:00
Zeev Suraski
63829bc949 Some more fixes 2001-07-28 12:02:42 +00:00
Zeev Suraski
d87cc976e1 Redesigned thread safety mechanism - nua nua 2001-07-28 11:36:37 +00:00
Zeev Suraski
fe6f8712a4 - Get rid of ELS_*(), and use TSRMLS_*() instead.
- Move to the new ts_allocate_id() API
This patch is *bound* to break some files, as I must have had typos somewhere.
If you use any uncommon extension, please try to build it...
2001-07-27 10:16:41 +00:00
Zeev Suraski
e280c3e555 Fix a corrupted memory access 2001-07-27 07:37:16 +00:00
Sascha Schumann
7c43206fb8 Remove unneeded variables 2001-07-26 18:10:38 +00:00
Zeev Suraski
536a53356d Get rid of the redundant global startup code 2001-07-24 20:30:37 +00:00
Sascha Schumann
a95101669d Handle file buckets for now; that allows us to pass something to the
engine which it can handle.
2001-07-23 04:50:13 +00:00
Sascha Schumann
36c2353046 Remove accidentially committed line 2001-07-23 02:39:59 +00:00
Sascha Schumann
bd573e42ad Call php_request_shutdown only, if the startup was successful. 2001-07-23 02:06:16 +00:00
Sascha Schumann
36be1040eb Use synchronous php_request_shutdown in the standard case and
let the pool cleanup function only become effective, when an
error has occured.

This fixes the problem that the request_conn was already dead
when the request_shutdown was reached.
2001-07-23 01:03:22 +00:00
Zeev Suraski
6fa5ac832f Fix Apache build 2001-07-21 16:18:03 +00:00
Andi Gutmans
4715403906 - Fix __FILE__ in the main script in CGI/command line mode. 2001-07-21 15:11:30 +00:00
Zeev Suraski
336004f4bc Improved bailout mechanism, supports nested bailouts a-la try..catch
Note:  You may *not* return directly from a catch block
2001-07-21 14:27:56 +00:00
Holger Zimmermann
7213492b3a Updated 2001-07-21 12:23:23 +00:00
Holger Zimmermann
31252e854b Updated 2001-07-20 22:11:13 +00:00
Holger Zimmermann
1b03f89fa0 Updated 2001-07-20 21:10:57 +00:00
Holger Zimmermann
a088c2e19d Updated PHP mode, fixed indent mode, added syntax check mode 2001-07-20 21:00:17 +00:00
Zeev Suraski
85b4df53c0 Improved interactive mode - it is now available in all builds, without any significant slowdown 2001-07-15 14:08:58 +00:00
Zeev Suraski
551f1831a7 Fix a major thread safety bug in the output mechanism
@- Fixed a major memory corruption bug in the thread safe version (Zeev)
2001-07-02 18:17:10 +00:00
Ben Mansell
c053f12207 Fix FastCGI shutdown for MacOSX, it didn't want to die. 2001-07-02 12:37:47 +00:00
Ben Mansell
d5cf0abac3 Make the FastCGI module behave nicer when trying to shut it down. If you
kill the parent process, then it will kill all its kiddies for you.
Also, now refuses to run as a CGI (since it doesn't work that way), and
corrected a few debug messages.
2001-06-30 17:03:52 +00:00
Sascha Schumann
e6d153f6c4 Support for handling multiple concurrent requests. 2001-06-23 16:27:56 +00:00
Sascha Schumann
0bbe77309d Accomodate an Apache API change 2001-06-22 23:20:49 +00:00
Zeev Suraski
8332ab409a Spit out errors 2001-06-21 14:18:23 +00:00
Sascha Schumann
e843e8c5f0 Move PHP_TARGET_RDYNAMIC check to global acinclude.m4 and use it
in thttpd's config.m4.
2001-06-15 12:53:20 +00:00
David Hedbor
6b0f88e828 Fix segfault when env vars are missing. 2001-06-08 16:31:22 +00:00
Sebastian Bergmann
49ab8cb8f1 Remove bogus '.'. 2001-06-06 13:24:17 +00:00
Rasmus Lerdorf
81e2cf03ac Fix folding and clean up some extensions 2001-06-06 13:06:12 +00:00
Martin Kraemer
f2002d3e41 Oops, sorry. I should not have committed this ebcdic fix (which was none) 2001-06-01 12:58:41 +00:00
Sascha Schumann
d342acc3a9 Add TUX SAPI module 2001-05-26 23:58:38 +00:00
Sascha Schumann
1ad2a710ab Use EXTRA_LDFLAGS at this point.
I've confirmed that one can build a working Apache DSO module now
(AIX 4.2 with gcc 2.95.2 and Apache 1.3.12).
2001-05-23 21:23:16 +00:00
Martin Kraemer
c96d652843 Fix Basic auth (when under PHP control) for EBCDIC platforms 2001-05-23 15:24:53 +00:00
Shane Caraveo
f0b6b8ab52 The -c commandline option was not working at all, need to set the path
override before calling on the module startup.
2001-05-22 23:05:08 +00:00
Sascha Schumann
40245019cc s/^I/ / and some re-indenting. Also align the APXS checking code
with the standard scheme.
2001-05-19 17:13:09 +00:00
Sascha Schumann
b56e877e53 Reindent, add link map for AIX, improve diagnostic message,
carry over all -D* CPPFLAGS, and nuke REGEX recognition.
2001-05-19 17:02:09 +00:00
Sascha Schumann
bc7a582f84 Use write(2), if we can successfully write to stdout. 2001-05-19 14:30:33 +00:00
Sascha Schumann
e29a1b2230 First try at using Apache's export list when building a DSO. 2001-05-18 20:53:53 +00:00
Thies C. Arntzen
e80abfa40c revert parts of last commit - stupid me! 2001-05-18 14:40:02 +00:00
Thies C. Arntzen
2db3431f00 --enable-memory-usage-info id deprecated. use --enable-memory-limit instead! 2001-05-18 14:32:05 +00:00
James Moore
6026a36879 Merge the more sensible way of doing this back in to HEAD 2001-05-17 23:57:43 +00:00
James Moore
873d59a8ea @ - Fixed getopt so it accepts arguments in the form -<option><value> not
@   just -<option> <value> (jmoore)
2001-05-17 21:32:05 +00:00
Zeev Suraski
89c7b891c9 Add missing info 2001-05-17 13:31:45 +00:00
Sterling Hughes
0492f086e7 # Revert the SLS_FETCH() ;) 2001-05-16 18:28:18 +00:00
Sterling Hughes
2d84ecbba8 Remove redundancy
# And further fix problem ;)
2001-05-16 18:15:49 +00:00
Sterling Hughes
4565812470 fix windows build.
#untested
2001-05-16 18:10:06 +00:00
Zeev Suraski
260b4d0dbf Merge memory usage into memory limit 2001-05-16 15:02:30 +00:00
Daniel Beulshausen
e1a9871337 add missing apls_fetch 2001-05-16 09:01:20 +00:00
Zeev Suraski
d1845fb138 Move the initialization to a safer place (earlier, it could end up
not being reset to 0 under certain circumstances)
2001-05-15 14:55:42 +00:00
Daniel Beulshausen
0f60b4b8a5 fix typo 2001-05-14 10:30:30 +00:00
Zeev Suraski
0113263991 Safer detection of recursive PHP invocations 2001-05-13 09:03:46 +00:00
Sascha Schumann
afdaee9e47 Nuke more quotes 2001-05-12 11:09:05 +00:00
Sascha Schumann
718b588b14 Fix indentation of ./configure --help messages. 2001-05-12 09:13:42 +00:00
Thies C. Arntzen
169febcdf0 @- Added --enable-memory-usage-info. This creates a new Apache 1.x logging
@  directive "{mod_php_memory_usage}n" which will log the peak amount of
@  memory used by the script. (Thies)
2001-05-11 18:17:08 +00:00
Zeev Suraski
4afa93f716 @- Fixed a possible crash in the PHP CGI when no input file is
@  specified (Zeev)
Fixed bug 7822
2001-05-10 14:13:18 +00:00
Zeev Suraski
6cd3b987b8 $argc was off by one in -f (fix bug #9289) 2001-05-08 00:51:11 +00:00
Zeev Suraski
910e9d068c whitespace 2001-05-07 22:02:44 +00:00
Zeev Suraski
d229f82a46 Allow virtual() of PHP files. We may have to improve the detection code a
bit, but it worked well on everything I tried.
2001-05-07 11:07:22 +00:00
David Hedbor
935d6287fd Patch from Jan Legenhausen to add vars to the HTTP_SERVER_VARS array. 2001-05-07 06:43:37 +00:00
Ben Mansell
13e4699ae3 Removed a duplicate php_import_environment_variables() call
from fastcgi sapi
2001-05-04 09:49:14 +00:00
Sascha Schumann
e337f07ecd Replace slow strlcpy with a quick memcpy. 2001-05-03 09:04:15 +00:00
Andi Gutmans
8975186810 - Another strncpy() -> strlcpy() change 2001-05-02 22:53:41 +00:00
Ben Mansell
98af7a8d7d Patch from Stephen Landamore: speed up the environment merging by
using memcpy instead of putenv.
2001-05-02 17:19:58 +00:00
Andi Gutmans
a166b6146b - Remove unused variable 2001-05-01 07:16:57 +00:00
Sterling Hughes
ba49860cc8 fix for bug 6491, http://www.php.net/bugs.php?id=6491, removes a bit of
(what I think is) broken logic.

#  This is as discussed on the mailing list previously.  This change
#  does fix the problem, however, the extra code was in there for a
#  reason (I'm guessing :), i'm ready to revert this patch in a jiffy
#  if someone has a good reason why that (just removed) extra logic
#  should be in there.
2001-05-01 03:48:27 +00:00
Andi Gutmans
6196e0bc4d - Fix for Bug id #10071
PR:
Submitted by:
Reviewed by:
Obtained from:
2001-04-30 22:47:51 +00:00
Andi Gutmans
4c823e8a89 - Change macros from V_ to VCWD_ because of AIX name clash 2001-04-30 12:45:02 +00:00
Daniel Beulshausen
59f3775f7c add/fix pi3web dsp 2001-04-28 18:46:56 +00:00
Sascha Schumann
6602b48071 Fix optimization -- we did not send out custom Response Status Lines. 2001-04-25 06:42:24 +00:00
Sascha Schumann
ab1df8dfb9 Accomodate Apache HTTPD 2.0 API change 2001-04-24 12:57:34 +00:00
David Hedbor
d522a6a25e Disable use of th_farm since it doesn't seem to work. Uses a Pike layer
thread farm now instead.
2001-04-24 01:08:35 +00:00
Sascha Schumann
ff423ef9d9 remove Only.* lines from patch 2001-04-22 14:33:57 +00:00
Sascha Schumann
0fc2ca64bf bytes in the conn structure was renamed to bytes_sent. 2001-04-22 14:22:40 +00:00
Sascha Schumann
38e55b3249 Update patch to thttpd-2.21 2001-04-22 14:00:53 +00:00
Stig Bakken
0b2641efa6 @Added -C command-line option to avoid chdir to the script's directory (Stig) 2001-04-16 23:20:47 +00:00
Sascha Schumann
466c226415 Revert mega patch.
This patch has at least the following deficiences:

- the CGI is built using objects from another SAPI module.
  This usually results in unsatisfied symbol references.
- the CGI makefile is not created properly
- building CGI cannot be disabled
2001-04-09 15:47:19 +00:00
Stig Bakken
a4877d7afd * CGI version is always installed!
* replaced --disable-pear with --with-pear=DIR (or --without-pear),
  is backwards compatible
* use --datadir, --libdir and --sysconfdir configure options to determine
  where PEAR files, shared extensions and php.ini goes
* simplified the extension version directory name
2001-04-08 22:30:17 +00:00
Holger Zimmermann
23f3187b6f Contribute the MSVC project file. Someone could add this to the php4ts workspace. 2001-04-08 11:04:27 +00:00
Holger Zimmermann
8c0f71e7b3 Reorganized the #define's in the header. 2001-04-08 10:49:07 +00:00
Holger Zimmermann
9b7aa43dd4 Updated copyright agreement regarding move of Pi3Web to sourceforge. 2001-04-08 08:25:20 +00:00
Sascha Schumann
d8b3bdf3bc Fix static Apache builds which were broken by the last commit. 2001-04-05 10:56:04 +00:00
Wilfredo Sanchez
cb71c4c2d0 Separate CPPFLAGS from CFLAGS. 2001-04-03 23:30:49 +00:00
Wilfredo Sanchez
0df6e8dd88 Add INSTALL_ROOT variable to specify install location. 2001-04-03 20:59:50 +00:00
foobar
8a26918ed1 Renamed the AC_ prefixed macros defined in acinclude.m4 to PHP_* prefixes.
# Heads up people! I tested this before committing but you never know..
2001-03-27 20:35:04 +00:00
Ben Mansell
afbcd5c4eb Changed header handling; before, we were somehow losing
Content-Type: text/html
2001-03-27 15:16:34 +00:00
Ben Mansell
4549e389bb Fix a bug with POST requests. If the Content-Type header wasn't present,
we were setting SG(request_info).content_type to NULL, instead of
an empty string. This was stopping PHP from processing the data.
2001-03-22 18:54:51 +00:00
Ben Mansell
87bc51fc5c Fix a bug with POST requests. If the Content-Type header wasn't present,
we were setting SG(request_info).content_type to NULL, instead of
an empty string. This was stopping PHP from processing the data.
2001-03-22 18:48:51 +00:00
Ben Mansell
2c8c9d68d7 Altered README.Zeus to give instructions on building FastCGI.
Changed --with-zeus configure option into --with-isapi, since its more
descriptive (and since there are now different ways to configure PHP+Zeus)
2001-03-19 11:23:57 +00:00
Ben Mansell
08df6f9b67 @ New FastCGI server module
New FastCGI server module. Based on the thttpd server module with
large chunks of code ripped from the cgi module. Also modifies
Makefile.in and configure.in in order to make it build properly.
# This initial checkin has been tested with the Zeus web server,
# but should work with any server that has a correct FastCGI
# implementation.
2001-03-19 11:03:29 +00:00
Stanislav Malyshev
5c1f7a2f60 Fix off-by-one on config values set from Apache config
# It didn't really hurt, since the extra character was always \0,
# but the phpinfo() display came out ugly.
2001-03-13 18:39:38 +00:00
Sascha Schumann
5708ddf171 Replace memcpy and sprintf with smart_strs. 2001-03-13 17:14:47 +00:00
foobar
f4917d49c3 Fixed the help for other options too. 2001-03-07 13:24:12 +00:00
Ben Mansell
515c20da47 Added support for Zeus SSL client certificate information.
Added SERVER_SIGNATURE to the environment.

Submitted by: daniel@zeus.com
2001-03-07 10:28:00 +00:00
Zeev Suraski
800950c5a7 Avoid using ret uninitialized 2001-03-06 15:10:53 +00:00
Ben Mansell
a40f208ab8 Thread hashtable was being initialized with a size of 1! Changed to 128 as
a more sensible number.
# Also could change the 'expected resources' parameter from 1, but I
# haven't tested that bit yet
----------------------------------------------------------------------
2001-03-06 15:09:15 +00:00
Zeev Suraski
559c254f8f Avoid writing to error_log in case of aborted connections. 2001-03-06 15:00:08 +00:00
foobar
356fc41a0a Fix help text for -f 2001-03-05 15:08:36 +00:00
foobar
81a2669216 Can't output any error messages if there isn't any function initialized
to do it..
# Bug report: #7650
2001-03-05 01:26:36 +00:00
Zeev Suraski
ce39c56c8b whitespace fix 2001-03-04 01:08:46 +00:00
Sascha Schumann
de6c69f716 Combine all HTTP headers into a single writev 2001-03-02 17:01:52 +00:00