php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 16:22:37 +01:00
Code Issues Packages Projects Releases Wiki Activity
91,179 Commits 545 Branches 1,479 Tags
tmp_liveliness
Commit Graph

733 Commits

Author SHA1 Message Date
Xinchen Hui
7af4e6d02d Fixed bug #70006 (cli - function with default arg = STDOUT crash output). 2015-07-07 19:21:02 +08:00
Anton Blanchard
275009d0bd http parser code assumes char is signed 
A char can be either signed or unsigned, and on PowerPC and ARM it is
unsigned. The following code will always be false on these architectures:

        if (c == -1) goto error;
 2015-07-06 10:13:00 +10:00
Aaron Piotrowski
ed1b64877d Switch position of ce in exception ce variable names 2015-07-03 09:45:03 -05:00
Aaron Piotrowski
a812a74c2e Change zend_exception_get_default() to zend_exception_ce 2015-07-03 09:44:48 -05:00
Anatol Belski
59444347d1 integrate the openssl applink shim 
This fixes ext/openssl/tests/openssl_spki_export.phpt failing
with the no OPENSSL_Applink error. Applink is also an interesting
technique documented in the OpenSSL FAQ
https://www.openssl.org/support/faq.html#PROG2
which allows under circumstances using different OpenSSL binaries
than those a program was linked with.
 2015-07-03 07:11:13 +02:00
Dmitry Stogov
7aa7627172 Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes). 2015-06-30 13:59:27 +03:00
Christoph M. Becker
a7bbc68bac Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
  Fixed #69655: php -S changes MKCALENDAR request method to MKCOL
 2015-06-27 20:05:30 +02:00
Christoph M. Becker
bbe28d3a55 Fixed #69655: php -S changes MKCALENDAR request method to MKCOL 
The parsing of the request method in the CLI server has been faulty, so that
several unsupported methods have been recognized as other methods.
 2015-06-27 20:02:21 +02:00
Christoph M. Becker
1ec6ff0b49 Merge branch 'PHP-5.6' 
* PHP-5.6:
  added skip condition for powershell requirement of test
 2015-06-27 15:05:29 +02:00
Christoph M. Becker
b811bb3920 added skip condition for powershell requirement of test 2015-06-27 15:02:52 +02:00
Christoph M. Becker
4e32ecb90a Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix #64878: 304 responses return Content-Type header
 2015-06-27 14:35:20 +02:00
Christoph M. Becker
1920ba6f7b Fix #64878: 304 responses return Content-Type header 
According to RFC 7232 304 responses should not send a Content-Type header,
so the CLI server should comply.
 2015-06-27 14:28:33 +02:00
Aaron Piotrowski
110e0a5a2c Merge branch 'master' into throwable-interface 
# Conflicts:
#	Zend/zend_language_scanner.c
#	Zend/zend_language_scanner.l
#	ext/simplexml/tests/SimpleXMLElement_xpath.phpt
 2015-06-14 18:53:11 -05:00
Anatol Belski
cfadcfc734 cleanup more redundant S_IS* declarations 2015-05-25 18:03:26 +02:00
Aaron Piotrowski
5c54bf015d Throwable method signatures. 2015-05-18 14:29:51 -05:00
Aaron Piotrowski
e97d5fab35 Update exception names in tests after formatting changes. 2015-05-17 17:31:43 -05:00
Aaron Piotrowski
fb7206e452 Merge branch 'master' into throwable-interface 2015-05-17 16:15:35 -05:00
Nikita Popov
3ae995f03c Tweak uncaught exception message display 
This implements a reduced variant of #1226 with just the following
change:

-Fatal error: Uncaught exception 'EngineException' with message 'Call to private method foo::bar() from context ''' in %s:%d
+Fatal error: Uncaught EngineException: Call to private method foo::bar() from context '' in %s:%d

The '' wrapper around messages is very weird if the exception
message itself contains ''. Futhermore having the message wrapped
in '' doesn't work for the "and defined" suffix of
TypeExceptions.
 2015-05-17 18:47:06 +02:00
Aaron Piotrowski
434a46612e Fix a few missed tests. 2015-05-16 22:04:16 -05:00
Aaron Piotrowski
64b167d201 Updated tests to reflect exception class changes. 2015-05-16 16:49:14 -05:00
Nikita Popov
c9f27ee422 Display EngineExceptions like ordinary exceptions 
TypeException stays as-is for now because it uses messages that are
incompatible with the way exception messages are displayed.

closure_038.phpt and a few others now show that we're generating
too many exceptions for compound operations on undefined properties
-- this needs to be fixed in a followup.
 2015-05-15 23:40:32 +02:00
Mats Lindh
7a57061a1f Add comment about SEARCH HTTP Verb being possible as well 2015-05-12 11:24:27 +02:00
Mats Lindh
b6018144cd Add test for the SEARCH HTTP verb in the CLI HTTP server. 2015-05-12 11:24:27 +02:00
Mats Lindh
98d015c5b7 Add "SEARCH" as supported HTTP verb. 
The "SEARCH" HTTP request method is described in RFC5323 as part of
WebDAV, and allows a client to initiate a server side search.
 2015-05-12 11:24:27 +02:00
Kalle Sommer Nielsen
8153286efe Drop zend_indent() as it was never used, complete or working 2015-03-27 20:04:46 +01:00
Anatol Belski
fc28ae2786 fix test 2015-03-23 22:21:30 +01:00
Xinchen Hui
8aa76a5bdd Fixed test 2015-03-21 17:50:50 +08:00
Xinchen Hui
c524dd6d1e Merge branch 'rfc-preg-replace-callback-array' of https://github.com/zxcvdavid/php-src 
Conflicts:
	Zend/zend_vm_gen.php
	ext/pcre/php_pcre.c
 2015-03-21 14:01:11 +08:00
Anatol Belski
eb5dfedb6b don't expect set/get title symbols are always there 2015-03-18 20:50:54 +01:00
Wei Dai
25566c67fe Implement preg_replace_callback_array function 2015-03-13 11:52:36 +08:00
Nikita Popov
b0055678bf Fix CLI test and drop some now unnecessary code 2015-03-09 14:09:34 +01:00
Dmitry Stogov
1c94ff0595 Implement engine exceptions 
RFC: https://wiki.php.net/rfc/engine_exceptions_for_php7

Pending changes regarding naming of BaseException and whether it
should be an interface.
 2015-03-09 14:01:32 +01:00
Reeze Xia
c6e415aeb2 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #67741 (auto_prepend_file messes up __LINE__)

Conflicts:
	main/main.c
 2015-03-03 11:44:52 +08:00
Reeze Xia
4e2c87edb3 Fixed bug #67741 (auto_prepend_file messes up __LINE__) 
This also fixes bug #54081
 2015-03-03 11:43:23 +08:00
Anatol Belski
af3ca74501 made ZEND_TSRMLS_CACHE_* macros look like function calls 
which also comply with the current semantics for such macros
 2015-02-16 17:19:32 +01:00
Dmitry Stogov
e10e151e9b Merged zend_array and HashTable into the single data structure. 
Now each HashTable is also zend_array, so it's refcounted and may be a subject for Copy on Write
zend_array_dup() was changed to allocate and return HashTable, instead of taking preallocated HashTable as argument.
 2015-02-13 22:20:39 +03:00
Anatol Belski
5d8ebcc73c remove useless condition (same as headers_list()) 2015-02-13 11:21:49 +01:00
Reeze Xia
bb20917049 Silence unused variable warning 2015-02-13 10:13:19 +00:00
Xinchen Hui
da7d94cd73 Merge branch 'PHP-5.6' 
Conflicts:
	ext/soap/soap.c
	ext/standard/basic_functions.c
	ext/zlib/zlib.c
 2015-02-13 13:28:24 +08:00
Dmitry Stogov
3e31838d19 zend_read_property() has to provide a holder for return value. 
Previously it was possible that zend_read_property() returned pointer to zval allocated on stack.
 2015-01-22 11:50:42 +03:00
Xinchen Hui
fc33f52d8c bump year 2015-01-15 23:27:30 +08:00
Xinchen Hui
0579e8278d bump year 2015-01-15 23:26:37 +08:00
Xinchen Hui
2193de0d18 Faster sorting algo 2015-01-14 18:02:41 +08:00
Stanislav Malyshev
b7a7b1a624 trailing whitespace removal 2015-01-10 15:07:38 -08:00
Rasmus Lerdorf
dbd02ad23b Fix bug #68784 2015-01-09 18:09:44 -08:00
Rasmus Lerdorf
5065505c93 Fix bug #68784 2015-01-09 18:09:13 -08:00
Adam Harvey
a607a1db1d Merge branch 'PHP-5.6' 
* PHP-5.6:
  Handle NULL strings in sapi_cli_server_register_variable().
  Allow CLI server test scripts to specify the name of the router file.

Conflicts:
	sapi/cli/php_cli_server.c
 2015-01-06 01:29:40 +00:00
Adam Harvey
27ff425b78 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Handle NULL strings in sapi_cli_server_register_variable().
  Allow CLI server test scripts to specify the name of the router file.

Conflicts:
	sapi/cli/tests/php_cli_server.inc
 2015-01-06 01:27:37 +00:00
Adam Harvey
448ef30f75 Handle NULL strings in sapi_cli_server_register_variable(). 
Fixes bug #68745 (Invalid HTTP requests make web server segfault).
 2015-01-06 01:23:27 +00:00
Adam Harvey
0cc2810498 Allow CLI server test scripts to specify the name of the router file. 
This is required to write tests that behave differently when an index.php isn't
present in the document root. (Such as the one I'm about to commit.)
 2015-01-06 01:22:59 +00:00