clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-06 09:16:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,251 Commits 494 Branches 1,367 Tags 822 MiB
ed58d3a235
Commit Graph

283 Commits

Author SHA1 Message Date
Rasmus Lerdorf
afa9e65ff4 Damn, went to head instead of the branch - revert 2001-09-06 23:35:39 +00:00
Rasmus Lerdorf
6a2d84ba06 Oops, forgot to add sapi_apache.c to the apache_hooks branch 2001-09-06 23:32:59 +00:00
Sterling Hughes
198e6f3ea7 no need to cast a 'HashTable *' to 'HashTable *' 2001-09-06 22:51:47 +00:00
foobar
e29994166a WS 2001-08-31 22:03:24 +00:00
Zeev Suraski
6bba521dd3 API update 2001-08-31 14:34:40 +00:00
Daniel Beulshausen
ba761ce9b1 TSRMLS fixes 2001-08-14 17:05:53 +00:00
Thies C. Arntzen
e8e401bc2d ypo;-) 2001-08-14 08:33:21 +00:00
Zeev Suraski
6ecae422c4 Use zend_first_try 2001-08-08 14:01:22 +00:00
Sascha Schumann
480ffb3d75 more tsrm cleanup 2001-08-05 16:43:57 +00:00
Sascha Schumann
373b3e101e more tsrm cleanup -- output.c is not doing any fetches anymore 2001-08-05 15:55:43 +00:00
Sascha Schumann
8aef193056 more tsrm cleanup 2001-08-05 15:29:47 +00:00
Zeev Suraski
1159c84ab7 - TSRMLS_FETCH work 
- whitespace fixes
 2001-08-05 01:43:02 +00:00
Sebastian Bergmann
b99798fda0 Another one bites the dust. 2001-08-04 17:07:16 +00:00
Sebastian Bergmann
b5763a70a6 Remove duplicate TSRMLS_FETCH() call. 2001-08-04 17:02:43 +00:00
Zeev Suraski
12318a2068 Fix Apache/ZTS build 2001-08-01 22:53:26 +00:00
Zeev Suraski
d76cf1da18 More TSRMLS_FETCH work 2001-07-31 04:53:54 +00:00
Thies C. Arntzen
5f6e3db13f compile fix 2001-07-30 14:25:29 +00:00
Zeev Suraski
797a079a95 More TSRMLS_FETCH work, and a bit of cleanup 2001-07-30 06:18:13 +00:00
Zeev Suraski
7b1c400631 More TSRMLS_FETCH annihilation (Zend compatibility patch) 2001-07-30 04:58:07 +00:00
Zeev Suraski
1c25b8dd53 Avoid TSRMLS_FETCH()'s, and clean up a bit of stale extern's and layout on the way 2001-07-30 01:56:43 +00:00
Rasmus Lerdorf
15ae74d3ba Fix typo 2001-07-28 14:01:24 +00:00
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
536a53356d Get rid of the redundant global startup code 2001-07-24 20:30:37 +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
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
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
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
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
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
e29a1b2230 First try at using Apache's export list when building a DSO. 2001-05-18 20:53:53 +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
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
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
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
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
Zeev Suraski
800950c5a7 Avoid using ret uninitialized 2001-03-06 15:10:53 +00:00
Zeev Suraski
559c254f8f Avoid writing to error_log in case of aborted connections. 2001-03-06 15:00:08 +00:00
Andi Gutmans
eb6ba01d1c - Fix copyright notices with 2001 2001-02-26 06:11:02 +00:00
Rasmus Lerdorf
0d0a8f55d6 Kill warning 2001-01-22 01:13:49 +00:00
Zeev Suraski
3793dc18f2 Sigh. Even less sleep than I thought :) Really fix it this time. 2001-01-22 01:10:21 +00:00
Zeev Suraski
9a02c9993d Too much work, not enough sleep... Fix hash lookup 2001-01-22 01:08:28 +00:00
Zeev Suraski
6255a24f1c Don't overwrite PATH_TRANSLATED if it exists 2001-01-22 00:06:52 +00:00
Daniel Beulshausen
0d258cc523 make threaded apache module build again 2001-01-05 17:00:07 +00:00
Zeev Suraski
43a7643453 Fix last couple of problematic execution paths that could corrupt the INI values 2001-01-03 22:45:11 +00:00
Zeev Suraski
60776dbeeb Fix Apache module and remove excess elements from the SAPI structure 2001-01-03 11:56:00 +00:00
foobar
c5da386dbd Fix compile. 2001-01-03 11:39:09 +00:00
Zeev Suraski
bd0ac7fe14 Many patches. I hope I remember them all: 
- Make sapi_module available to external modules (PHPAPI)
- Make the php.ini path reported in phpinfo() always point to
  real full path of the php.ini file
- Optimized the ISAPI module not to read unnecessary server
  variables and read necessary variables at most once.
 2001-01-02 22:49:31 +00:00
Zeev Suraski
0048312fa6 Fix a few possible bugs: 
- engine=off in one or more vhosts could propogate to other vhosts
- Under some error situations, the default values for INI directives
  could be erroneously replaced for a single request
 2000-12-30 00:38:47 +00:00
Daniel Beulshausen
3b20a425c9 added missing SLS_FETCH() 2000-12-14 22:16:21 +00:00
Sascha Schumann
276cb7cdb1 Add apache_child_terminate() and INI setting apache.child_terminate 
which defaults to 0.

Submitted by: Sam Liddicott <sam.liddicott@ananova.com>
 2000-12-13 13:19:56 +00:00
Sascha Schumann
107aa9f71a Align ZTS handling of globals with common usage 2000-12-10 23:22:20 +00:00
Daniel Beulshausen
d41137fedf fix win32 apache module 
# this is ugly, has someone a better way?
 2000-12-10 22:40:07 +00:00
Daniel Beulshausen
1f31360f01 fix windows build 2000-12-10 22:06:07 +00:00
Sascha Schumann
0ddb725f91 Axe rest of DAV leftovers and use STD_PHP_INI_ENTRY in the INI section 2000-12-07 13:07:18 +00:00
Sascha Schumann
dedec6614e Automatically carry over macro definitions from Apache. 
We don't take everything, because apxs' CFLAGS also includes
optimization, debugging, et cetera flags.

PR: #7211
 2000-12-04 16:05:00 +00:00
Hartmut Holzgraefe
929197cf83 merged ext/apache/CREDITS and sapi/apache/CREDITS 2000-11-22 23:04:33 +00:00
Hartmut Holzgraefe
1f6878e912 2nd step towards auto-credits 2000-11-20 10:33:33 +00:00
Zeev Suraski
030b707296 Update SAPI modules to interface with the new TSRM. 
Enable thread-safety memory debugging in ISAPI when in debug mode
 2000-11-18 02:44:04 +00:00
Zeev Suraski
0f7f5c2c0e - Import Jade Nicoletti's transparent gzip encoding support as an output 
handler.  Works quite nicely!
- Fix buglets in output buffering
- Add output_handler INI directive
 2000-11-13 18:54:37 +00:00
Sascha Schumann
04f180b08a More verbose error message for non-working apxs case 2000-11-13 12:43:44 +00:00
Zeev Suraski
a023f9280a - Fix Windows build 
- Changed the Apache .dsp to expect the Apache source code files under php_build
 2000-11-02 14:53:10 +00:00
Zeev Suraski
8c4852c2cb Fix a nasty bug in the shutdown sequence of PHP under Apache. 2000-11-02 12:05:54 +00:00
Andi Gutmans
0330643ea2 - Revert patch which seems to have caused the STOP mechanism not to work. 
- I'm not quite sure why this should have caused harm even if not completey
- the right way of doing it.
 2000-11-01 11:23:52 +00:00
Zeev Suraski
0ee12a6488 Fix Apache build 2000-10-31 18:28:04 +00:00
Sascha Schumann
27a8480028 Add/unify aborted connection handling 2000-10-29 16:01:02 +00:00
Zeev Suraski
1fd09132c2 Initial steps to move the INI mechanism to the Zend engine 2000-10-29 11:38:26 +00:00
Rasmus Lerdorf
c3026223f7 This appears to be the correct fix to me. 
@ Fix memory leak in x-httpd-source mode (Jason Greene)
 2000-10-14 05:06:16 +00:00
Daniel Beulshausen
c6e0cef254 trivial output change 
# someone urged me too
 2000-10-13 19:08:05 +00:00
Zeev Suraski
ce51b94461 Fix php_value issue 2000-10-13 17:07:09 +00:00
Zeev Suraski
1abd99a443 Fixed a problem that allowed users to override admin_value's and admin_flag's 2000-10-11 16:24:35 +00:00
Andi Gutmans
2622eba31d - Cleanup some output functions 2000-09-30 16:13:48 +00:00
Sascha Schumann
3be464e4ec UnixWare defines shutdown to _shutdown, which causes problems later 
on when using a structure member named shutdown. Since this source
file does not use the system call shutdown, it is safe to #undef it.

PR: #6008, #6362
 2000-09-29 19:08:17 +00:00
Sascha Schumann
cd151feb19 #include "SAPI.h" once 2000-09-26 10:58:56 +00:00
foobar
9559b88894 Fixed bug #6356. 2000-09-11 13:01:07 +00:00
Jon Parise
9a4c654606 Fix build after last commit. 2000-09-08 15:39:42 +00:00
Zeev Suraski
91c808ecc4 Restore the headers_only test to the centralized SAPI startup. If necessary, it can 
be overriden in the activate() callback.
 2000-09-08 14:43:57 +00:00
Andi Gutmans
9b1aed8323 - Add another ..\ to the TSRM search path 2000-09-08 08:17:17 +00:00
Andi Gutmans
ed8c8539df - Add TSRM to the apache workspace include path 2000-09-08 08:15:25 +00:00
Sascha Schumann
89a2e1dbdb Add TSRM include dirs 2000-09-06 15:41:40 +00:00
Andi Gutmans
570e7e9a13 - Defining TSRM_WIN32 in each and every dsp sucked. Revert this change 2000-09-02 16:28:25 +00:00
Andi Gutmans
5bc9f72e85 - More Windows build fixes 2000-09-02 16:02:53 +00:00