clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 14:56:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
78,180 Commits 494 Branches 1,367 Tags 801 MiB
01d5e28057
Commit Graph

78180 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Derick Rethans
405f6417f1 Merge branch 'PHP-5.4' into PHP-5.5 2014-01-02 12:52:08 +00:00
Derick Rethans
63d390cdf9 Merge branch 'PHP-5.6' 2014-01-02 12:47:52 +00:00
Derick Rethans
110b7dcfb8 Merge branch 'PHP-5.5' into PHP-5.6 2014-01-02 12:47:44 +00:00
Derick Rethans
5137cb5f0c Fixed (some of) add/sub. 
This worked in PHP 5.4 already, but with the introduction of DateTimeImmutable
this code was not correctly merged.
 2014-01-02 12:45:48 +00:00
Derick Rethans
dee77f237c Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 2014-01-02 10:57:46 +00:00
Felipe Pena
9eb7997852 - BFN 2014-01-01 22:33:12 -02:00
krakjoe
9e4ab7c53f Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix #66375 bad logic in sapi header callback routine
 2014-01-01 13:01:41 +00:00
krakjoe
8a7e2f8dd2 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix #66375 bad logic in sapi header callback routine
 2014-01-01 13:01:06 +00:00
krakjoe
e9195018dc Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix #66375 bad logic in sapi header callback routine
 2014-01-01 13:00:29 +00:00
krakjoe
3c3ff43432 fix #66375 bad logic in sapi header callback routine 2014-01-01 12:58:18 +00:00
Felipe Pena
57a6209051 Merge branch 'PHP-5.6' 
* PHP-5.6:
  - Fixed bug #66381 (__ss_family was changed on AIX 5.3)
 2014-01-01 09:57:03 -02:00
Felipe Pena
37897e258d Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  - Fixed bug #66381 (__ss_family was changed on AIX 5.3)
 2014-01-01 09:56:49 -02:00
Felipe Pena
49cdde7326 Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5 2014-01-01 09:56:31 -02:00
Felipe Pena
5967fb194f - Fixed bug #66381 (__ss_family was changed on AIX 5.3) 2014-01-01 09:55:14 -02:00
Nikita Popov
73db3cda8b Merge branch 'PHP-5.6' 2013-12-30 14:41:45 +01:00
Nikita Popov
5408f1e5a6 Throw warning when converting invalid string to GMP 2013-12-30 14:38:09 +01:00
Michael Wallner
79d1c70e99 This should be an empty merge. 
Merge branch 'PHP-5.6'

* PHP-5.6:
  update php.ini-*
  Add E_DEPRECATED when populating $HTTP_RAW_POST_DATA
  add 'never'
  fix type
  fix type; add tests for -1
  s/BOOLEAN/ENTRY/
  re-introduce always_populate_raw_post_data
 2013-12-30 14:32:25 +01:00
Michael Wallner
feb4caad09 update php.ini-* 2013-12-30 14:28:43 +01:00
Michael Wallner
4797f7ad16 Add E_DEPRECATED when populating $HTTP_RAW_POST_DATA 2013-12-30 14:28:43 +01:00
Michael Wallner
729f85fad7 add 'never' 2013-12-30 14:28:43 +01:00
Michael Wallner
7762de4022 fix type 2013-12-30 14:28:43 +01:00
Michael Wallner
cea59a74a7 fix type; add tests for -1 2013-12-30 14:28:42 +01:00
Michael Wallner
4153c23efa s/BOOLEAN/ENTRY/ 2013-12-30 14:28:42 +01:00
Michael Wallner
3641507fc1 re-introduce always_populate_raw_post_data 2013-12-30 14:28:42 +01:00
Nikita Popov
056f3441fd Merge branch 'PHP-5.6' 2013-12-30 13:59:55 +01:00
Nikita Popov
71a36fb6ae Merge branch 'PHP-5.5' into PHP-5.6 2013-12-30 13:58:29 +01:00
Nikita Popov
c7ee97eea0 Merge branch 'PHP-5.4' into PHP-5.5 2013-12-30 13:54:58 +01:00
Nikita Popov
3b6afb1bd6 Fix leak caused by fix to bug #65667 
ftp->stream is now closed in the ftp resource dtor.
 2013-12-30 13:53:12 +01:00
Remi Collet
a3c7971f94 Merge branch 'PHP-5.6' 
* PHP-5.6:
  missing file from libzip 0.11.2
 2013-12-30 10:00:19 +01:00
Remi Collet
33ef788abd missing file from libzip 0.11.2 2013-12-30 10:00:02 +01:00
Remi Collet
7844fb292c Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix compat for PHP ABI changes
 2013-12-30 08:47:23 +01:00
Remi Collet
3a492cf686 fix compat for PHP ABI changes 2013-12-30 08:47:16 +01:00
Remi Collet
717dcdaa67 Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
 2013-12-30 07:45:17 +01:00
Remi Collet
41cdb132c8 NEWS 2013-12-30 07:45:09 +01:00
Remi Collet
764190c1d6 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Sync with pecl/zip 1.12.4dev
 2013-12-30 07:38:45 +01:00
Remi Collet
0a950a0500 Sync with pecl/zip 1.12.4dev 
- update bunled libzip to 0.11.2
- expose zip_file_set_external_attributes + zip_file_get_external_attributes
  with new methods:
	ZipArchive::setExternalAttributesName
	ZipArchive::setExternalAttributesIndex
	ZipArchive::getExternalAttributesName
	ZipArchive::getExternalAttributesIndex
 2013-12-30 07:35:30 +01:00
Xinchen Hui
6b34343479 Merge branch 'PHP-5.6' 2013-12-30 11:07:42 +08:00
Xinchen Hui
5a756afcf1 Merge branch 'PHP-5.5' into PHP-5.6 2013-12-30 11:07:37 +08:00
Xinchen Hui
ed5be4f7ad Fix test fail 2013-12-30 11:07:25 +08:00
Xinchen Hui
8b72df0608 Merge branch 'PHP-5.6' 2013-12-30 10:58:56 +08:00
Xinchen Hui
31d4d11432 Fix one more test in dos style eol 2013-12-30 10:58:40 +08:00
Xinchen Hui
f204df9a7f Merge branch 'PHP-5.5' into PHP-5.6 2013-12-30 10:58:23 +08:00
Xinchen Hui
6699b1f8ea Fix dos style eol in phpts 2013-12-30 10:58:01 +08:00
Xinchen Hui
408ae9a452 Merge branch 'PHP-5.6' 2013-12-30 10:52:21 +08:00
Xinchen Hui
a88543a106 Fixed bug #66298 (ext/opcache/Optimizer/zend_optimizer.c has dos-style ^M as lineend) 2013-12-30 10:51:47 +08:00
Xinchen Hui
a8548d9765 Merge branch 'PHP-5.5' into PHP-5.6 2013-12-30 10:51:36 +08:00
Xinchen Hui
04c8ce259f Fixed bug #66298 (ext/opcache/Optimizer/zend_optimizer.c has dos-style ^M as lineend) 
Use git blame -w to ingore the space changes
 2013-12-30 10:50:46 +08:00
Remi Collet
bd3e5aab1d Merge branch 'PHP-5.6' 
* PHP-5.6:
  minor fix on previous
 2013-12-28 14:29:38 +01:00
Remi Collet
809eb77689 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  minor fix on previous
 2013-12-28 14:29:27 +01:00
Remi Collet
464c219ed4 minor fix on previous 2013-12-28 14:29:14 +01:00