mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-14 12:26:19 +08:00
Code Issues Packages Projects Releases Wiki Activity
95,355 Commits 503 Branches 1,384 Tags 813 MiB
8be59a1301
Commit Graph

792 Commits

Author SHA1 Message Date
Nikita Popov
842e408c67 Don't copy mime types in CLI server 
This is both unnecessary and causes leaks in valgrind.
 2016-08-09 15:34:03 +02:00
Christoph M. Becker
95190db84d Merge branch 'PHP-5.6' into PHP-7.0 2016-07-28 16:54:36 +02:00
Christoph M. Becker
6e886f07a8 Fix #72676: Test cli_process_title_unix fails on AIX 
Patch provided by matthieu dot sarter dot external at atos dot net.
 2016-07-28 16:51:45 +02:00
Xinchen Hui
de7a6b1232 MFH: Fixed fd leak (the origin commit can not be cherry-picked) 2016-06-28 11:36:27 +08:00
Xinchen Hui
0183a9af5a Fixed bug #72484 (SCRIPT_FILENAME shows wrong path if the user specify router.php) 2016-06-24 18:08:16 -07:00
Joe Watkins
dbae1653da fix size_t signed comparison 2016-04-29 10:19:55 +01:00
Xinchen Hui
163d26d584 Fixed failed with libedit 2016-04-15 11:57:53 +08:00
Sean DuBois
68ebfc87ad Fix bug #71624, PHP_MODE_PROCESS_STDIN (CLI SAPI called with '-R') did not properly set $argi and $argn 2016-03-15 07:02:40 +01:00
Nikita Popov
3240dd93b3 Merge branch 'PHP-5.6' into PHP-7.0 2016-03-03 19:27:35 +01:00
Christoph M. Becker
2d4ad66ff2 Fixed bug #69953 
Added support for MKCALENDAR request method in CLI web server.
 2016-03-03 19:22:38 +01:00
Nikita Popov
1ac152938c Move semicolon into TSRMLS_CACHE_EXTERN/DEFINE 
Also re bug #71575.
 2016-03-03 16:50:01 +01:00
Nikita Popov
5527c5b083 Merge branch 'PHP-5.6' into PHP-7.0 2016-03-03 16:38:13 +01:00
Nikita Popov
bdd578fcbb Disable upload_2G test on travis 2016-03-03 16:35:45 +01:00
Stanislav Malyshev
90a0cbd594 Merge branch 'PHP-5.6.19' into PHP-7.0.4 
* PHP-5.6.19:
  fix test file
  Fix version
  update NEWS
  Update NEWS
  Fix bug #71498: Out-of-Bound Read in phar_parse_zipfile()
  fix ts buld
  prep for 5.6.19RC1
  5.6.20 is next
  Fixed bug #71587 - Use-After-Free / Double-Free in WDDX Deserialize

Conflicts:
	configure.in
	ext/wddx/wddx.c
	main/php_version.h
 2016-03-01 23:01:48 -08:00
Anatol Belski
68a51ae953 fix ts buld 2016-02-18 10:31:24 +01:00
Anatol Belski
a329dc70e9 fix ts buld 2016-02-18 07:11:36 +01:00
Anatol Belski
724ee19111 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fixed bug #71559 Built-in HTTP server, we can downlaod file in web by bug
 2016-02-14 20:49:03 +01:00
Anatol Belski
ce4a2f0fc6 Fixed bug #71559 Built-in HTTP server, we can downlaod file in web by bug 2016-02-14 20:47:23 +01:00
Joe Watkins
3ac63df9bc be more precise about the meaning of -n 2016-02-10 12:57:48 +00:00
Anatol Belski
71dbad172f Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fork test
  fix test
  fork test
  fork test for win32
  fork test
 2016-01-18 17:02:23 +01:00
Anatol Belski
5673ede6e9 fix test 2016-01-18 16:52:48 +01:00
Julien Pauli
736b91c650 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Happy new year (Update copyright to 2016)

Conflicts:
	ext/json/php_json_encoder.h
	sapi/continuity/capi.c
 2016-01-04 18:13:38 +01:00
Lior Kaplan
53fb2f1e5c Happy new year (Update copyright to 2016) 2016-01-03 01:44:37 +02:00
Lior Kaplan
2eb1f38d24 Happy new year (Update copyright to 2016) 2016-01-01 20:03:16 +02:00
Lior Kaplan
ed35de784f Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Happy new year (Update copyright to 2016)
 2016-01-01 19:48:25 +02:00
Lior Kaplan
49493a2dcf Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
Julien Pauli
ea12ff149c Added support for HTTP 451 2015-12-23 11:31:18 +01:00
Adam Harvey
91bad929aa Fix bug #71005 (Segfault in php_cli_server_dispatch_router()). 
We didn't initialise the retval variable in
php_cli_server_dispatch_router(); let's now initialise it to be
IS_UNDEF, as the following if condition expects.
 2015-12-01 03:09:36 +00:00
Lior Kaplan
9642710a09 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fixed bug #61751 (SAPI build problem on AIX: Undefined symbol: php_register_internal_extensions)

 Conflicts:
	sapi/cgi/config9.m4
	sapi/fpm/config.m4
 2015-11-23 18:56:13 +02:00
Lior Kaplan
d6b78a3511 Fixed bug #61751 (SAPI build problem on AIX: Undefined symbol: php_register_internal_extensions) 2015-11-23 18:40:47 +02:00
Reeze Xia
c856b6e0ff Update mime type generator script to keep track of additional mime-types 2015-11-15 20:25:47 +08:00
Thorsten Rinne
04c3fbac37 Added support for CSS/JavaScript source maps 
Source maps (http://www.html5rocks.com/en/tutorials/developertools/sourcemaps/) are basically a way to map a combined/minified file back to an unbuilt state. To avoid error messages in Browser DevTools, source map files should be served with the MIME type "application/json"
 2015-11-15 20:25:39 +08:00
Xinchen Hui
f72c7edfa4 Ensure the test fails 2015-11-11 14:55:33 +01:00
Xinchen Hui
88fb6d90c4 Ensure the test fails 2015-11-11 19:51:33 +08:00
Anatol Belski
8155ecba61 Fixed bug #70863 Incorect logic to increment_function for proxy objects 2015-11-06 23:07:16 +01:00
Bob Weinand
ba6d193b4c Add NTS/ZTS information to php -v 2015-09-30 12:39:09 +02:00
Xinchen Hui
874dc06156 Merge branch 'PHP-5.6' 2015-09-11 13:52:00 +08:00
Xinchen Hui
37d814b84c Add test XFAIL for bug #70470 2015-09-11 13:45:18 +08:00
Christoph M. Becker
cc9da62bdb Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix #68291: 404 on urls with '+'

Resolved conflicts:
	sapi/cli/php_cli_server.c
 2015-09-05 14:43:19 +02:00
Christoph M. Becker
fd94c92171 Fix #68291: 404 on urls with '+' 
URI paths have to be treated according to RFC 3986 by the CLI web server, not
as application/x-www-form-urlencoded.
 2015-09-05 14:34:08 +02:00
Joe Watkins
85a511d2c1 fix zend signal and tsrm compat 2015-09-01 09:34:54 +01:00
Christoph M. Becker
fc444896af Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix #70264: CLI server directory traversal
 2015-08-14 17:18:35 +02:00
Christoph M. Becker
9c805a6cb3 Fix #70264: CLI server directory traversal 
On Windows the built-in webserver doesn't prevent directory traversal when
backslashes are used as path component separators. Even though that is not a
security issue (the CLI webserver is meant for testing only), we fix that by
replacing backslashes in the path with slashes on Windows, because backslashes
may be valid characters for file names on other systems, but not on Windows.
 2015-08-14 17:05:31 +02:00
wusuopu
72976e2497 Fix #66606: Sets HTTP_CONTENT_TYPE but not CONTENT_TYPE 
The patch will store Content-Type header value in both HTTP_CONTENT_TYPE field and CONTENT_TYPE field.
 2015-08-09 02:37:16 +02:00
Christoph M. Becker
1b4a80332c added tests for bug #66606 2015-08-09 02:36:58 +02:00
Stanislav Malyshev
54187fa4b9 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix test
 2015-08-04 16:45:55 -07:00
Stanislav Malyshev
2425f88afd Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix test
 2015-08-04 16:45:32 -07:00
Stanislav Malyshev
da5321013c fix test 2015-08-04 16:45:20 -07:00
Stanislav Malyshev
ed709d5aa0 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  update NEWS
  fix test
  update NEWS
  Fix bug #70019 - limit extracted files to given directory
  Do not do convert_to_* on unserialize, it messes up references
  Fix #69793 - limit what we accept when unserializing exception
  Fixed bug #70169 (Use After Free Vulnerability in unserialize() with SplDoublyLinkedList)
  Fixed bug #70166 - Use After Free Vulnerability in unserialize() with SPLArrayObject
  ignore signatures for packages too
  Fix bug #70168 - Use After Free Vulnerability in unserialize() with SplObjectStorage
  Fixed bug #69892
  Fix bug #70014 - use RAND_bytes instead of deprecated RAND_pseudo_bytes
  Improved fix for Bug #69441
  Fix bug #70068 (Dangling pointer in the unserialization of ArrayObject items)
  Fix bug #70121 (unserialize() could lead to unexpected methods execution / NULL pointer deref)
  Fix bug #70081: check types for SOAP variables

Conflicts:
	ext/soap/php_http.c
	ext/spl/spl_observer.c
 2015-08-04 15:29:13 -07:00
Stanislav Malyshev
742c54aecf Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix test
  update NEWS
 2015-08-04 14:46:30 -07:00