clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 19:07:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
80,365 Commits 491 Branches 1,363 Tags 846 MiB
6b9fa109e0
Commit Graph

752 Commits

Author SHA1 Message Date
Stanislav Malyshev
d3eac6399b Merge branch 'PHP-5.6' 
* PHP-5.6:
  update news
  add news
  Bug 49898 __getCookies() method implementation
 2014-06-08 19:47:59 -07:00
Stanislav Malyshev
df03bcf135 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  add news
  Bug 49898 __getCookies() method implementation
 2014-06-08 19:47:38 -07:00
Stanislav Malyshev
1b8d4695e2 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  add news
  Bug 49898 __getCookies() method implementation
 2014-06-08 19:46:12 -07:00
Boro Sitnikovski
aebb23e4db Bug 49898 
__getCookies() method implementation
 2014-06-08 19:36:18 -07:00
Bob Weinand
9663193bbc Merge branch 'PHP-5.6' 2014-04-11 10:11:58 +02:00
Bob Weinand
f614fc6898 Fix bug #66015 by reverting "Removed operations on constant arrays." 2014-04-11 10:08:44 +02:00
Xinchen Hui
0f53e37494 Merge branch 'PHP-5.6' 2014-01-03 11:09:07 +08:00
Xinchen Hui
c081ce628f Bump year 2014-01-03 11:08:10 +08:00
Xinchen Hui
47c9027772 Bump year 2014-01-03 11:06:16 +08:00
Xinchen Hui
c0d060f5c0 Bump year 2014-01-03 11:04:26 +08:00
Kalle Sommer Nielsen
2eb9bd316d Merge branch 'master' of https://git.php.net/push/php-src 2013-12-18 07:27:14 +01:00
Kalle Sommer Nielsen
d14670ccdb Eliminate another TSRMLS_FETCH() in i_zend_is_true() 
# Affected extensions have all been updated, ext/opcache and ext/zip
# both have macros for cross version compatibility
 2013-12-18 07:25:05 +01:00
Dmitry Stogov
9850d57fd9 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed tests
  Fixed ext/soap/tests/bugs/bug54911.phpt
 2013-12-12 13:55:23 +04:00
Dmitry Stogov
0344e6a429 Fixed tests 2013-12-12 13:35:37 +04:00
Dmitry Stogov
1886292ec9 Fixed ext/soap/tests/bugs/bug54911.phpt 2013-12-12 13:02:50 +04:00
Dmitry Stogov
fe93347ba0 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #66112 (Use after free condition in SOAP extension). (martin dot koegler at brz dot gv dot at)

Conflicts:
	NEWS
 2013-12-10 17:58:22 +04:00
Dmitry Stogov
552e8b2b4c Fixed bug #66112 (Use after free condition in SOAP extension). (martin dot koegler at brz dot gv dot at) 2013-12-10 17:57:05 +04:00
Dmitry Stogov
5ad1117419 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Arguments passed to user function have to be properly allocated on heap
 2013-12-10 13:03:09 +04:00
Dmitry Stogov
a6516653b7 Arguments passed to user function have to be properly allocated on heap 2013-12-10 13:00:45 +04:00
Dmitry Stogov
6c2a806820 Avoid interned hash key duplication and hash key length recaclulation 2013-11-29 00:57:49 +04:00
Anatol Belski
c675980046 Merge branch 'pull-request/500' 
* pull-request/500:
  limit virtual_cwd_activate() duplicated call to ZTS only
  reverted the previous commit, both calls are needed in TS mode
  virtual_cwd_activate() should be called only in one place
  back to do_alloca()
  removed unnecessary call
  simplify the state free macros
  compact the code to preserve the error info after state freeing
  back to do_alloca(), reverted the wrong replacement
  enabled windows to use stack in both ts/nts mode, some more fixes
  moved to do_alloca() usage where appropriate
  fixed invalid free
  fixed virtual cwd header in phar
  updated NEWS
  fixed all the places where last error could be lost
  preserve the error code
  applied and fixed the original patch
  initial move on renaming files and fixing includes

Conflicts:
	ext/opcache/ZendAccelerator.c
 2013-11-05 19:23:23 +01:00
Felipe Pena
39e746a424 Merge branch 'PHP-5.5' 
* PHP-5.5:
  - Moved allocation to if block to make Coverity happy
 2013-10-19 23:36:41 -03:00
Felipe Pena
0b5c2887cd Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Moved allocation to if block to make Coverity happy
 2013-10-19 23:36:36 -03:00
Felipe Pena
85a622e42f - Moved allocation to if block to make Coverity happy 2013-10-19 23:36:28 -03:00
Anatol Belski
e30b2aae5a initial move on renaming files and fixing includes 2013-10-17 09:43:52 +02:00
Michael Wallner
e6084da473 final bits 2013-09-17 13:59:49 +02:00
Michael Wallner
423c70fb4d Merge branch 'slim-postdata-merge' 
* slim-postdata-merge:
  remove unused code
  tests
  make reading php://input JIT if enable_post_data_reading=0
  revert stream cast
  fix ZTS build
  slim post data

Conflicts:
	ext/soap/soap.c
	ext/standard/php_fopen_wrapper.c
	main/SAPI.c
 2013-09-17 13:52:25 +02:00
Michael Wallner
d4b673a34c fix ZTS build 2013-08-27 14:01:59 +02:00
Michael Wallner
bb1f9d3826 slim post data 2013-08-27 13:43:22 +02:00
Michael Wallner
2438490add slim post data 2013-08-27 13:31:35 +02:00
Christopher Jones
c6d977dd39 Fix long-standing visual pain point: the misalignment of './configure help' text. 
Whitespace changes and a couple of grammar fixes.
 2013-08-06 11:06:09 -07:00
Dmitry Stogov
5129892788 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Improved fix for bug #44686 (SOAP-ERROR: Parsing WSDL)
 2013-07-31 17:37:08 +04:00
Dmitry Stogov
4395f70207 Improved fix for bug #44686 (SOAP-ERROR: Parsing WSDL) 2013-07-31 17:36:06 +04:00
Dmitry Stogov
35872e101b Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #65018 (SoapHeader problems with SoapServer)
  MFH: fixed #65045: mb_convert_encoding breaks well-formed character.
  Fixed bug #65336

Conflicts:
	NEWS
 2013-07-31 16:34:26 +04:00
Dmitry Stogov
fd8f454520 Fixed bug #65018 (SoapHeader problems with SoapServer) 2013-07-31 16:32:26 +04:00
Anatol Belski
8aebe0f1e7 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt
 2013-07-23 10:00:07 +02:00
Anatol Belski
9b6aa268a3 fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt 2013-07-23 09:59:08 +02:00
Veres Lajos
e9a95d78ef typo fixes 2013-07-15 00:23:03 -07:00
Veres Lajos
72085b0e5f typo fixes 2013-07-15 00:18:57 -07:00
Stanislav Malyshev
02e4d7a290 Merge branch 'pull-request/341' 
* pull-request/341: (23 commits)
  typofixes
 2013-06-10 14:30:59 -07:00
Stanislav Malyshev
ac40c0b562 Merge branch 'pull-request/341' 
* pull-request/341: (23 commits)
  typofixes
 2013-06-10 14:20:18 -07:00
Stanislav Malyshev
84e35fb2e0 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  typo fixes (argument)
  typo fixes (accommodate, parameter)
 2013-06-10 13:36:41 -07:00
Veres Lajos
ed2e84e239 typo fixes (accommodate, parameter) 2013-06-10 13:36:03 -07:00
Anatol Belski
e191cb63ba Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix heap overflow warnings on win x64 debug crt
 2013-05-13 14:26:50 +02:00
Anatol Belski
156576fcce Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  fix heap overflow warnings on win x64 debug crt
 2013-05-13 14:25:25 +02:00
Anatol Belski
fe21accfb4 fix heap overflow warnings on win x64 debug crt 2013-05-13 14:24:21 +02:00
Dmitry Stogov
c782cf7fb3 Added SoapClient constructor option 'ssl_method' to specify ssl method 2013-04-30 10:24:49 +04:00
Nikita Popov
0e25e00ecf Fix whitespace issue in the SOAP test 2013-03-28 19:10:57 +01:00
Nikita Popov
a5e606a2ba Fix SOAP test 
Doesn't look like these warnings are present anymore.
 2013-03-28 19:05:06 +01:00
Nikita Popov
fcc6611de9 Add support for non-scalar Iterator keys in foreach 
RFC: https://wiki.php.net/rfc/foreach-non-scalar-keys
 2013-03-12 17:27:31 +01:00