php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-05 23:23:03 +02:00
Code Issues Packages Projects Releases Wiki Activity
74,309 Commits 547 Branches 1,481 Tags
eaec5522ff2dec3e0ecfc73d0f64ea2cbb40b728
Commit Graph

31700 Commits

Author SHA1 Message Date
Pierre Joye
eaec5522ff Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix #64725, wrong res check
 2013-04-27 17:52:38 +02:00
Pierre Joye
25c9f34c9c fix #64725, wrong res check 2013-04-27 17:52:30 +02:00
Pierre Joye
bba7f8aa31 Merge branch 'PHP-5.5' 
* PHP-5.5:
  - #64710, check return val
  - #64710, kill unused var
  #64710, kill unused vars
  #64710, kill unused vars
  #64710, kill unused vars
  #64710, kill unused vars
  #64710, kill unused vars
  #64710, Implicit declaration
 2013-04-26 08:16:02 +02:00
Pierre Joye
2809afa119 - #64710, check return val 2013-04-26 08:15:33 +02:00
Pierre Joye
7bd20354a8 - #64710, kill unused var 2013-04-26 08:15:05 +02:00
Pierre Joye
b0afef2d5e #64710, kill unused vars 2013-04-26 08:10:24 +02:00
Pierre Joye
685a6d9aab #64710, kill unused vars 2013-04-26 08:09:19 +02:00
Pierre Joye
7b06189702 #64710, kill unused vars 2013-04-26 08:08:38 +02:00
Pierre Joye
3fffc78ed0 #64710, kill unused vars 2013-04-26 08:07:47 +02:00
Pierre Joye
b5902b6c9d #64710, kill unused vars 2013-04-26 08:06:34 +02:00
Pierre Joye
afe46d4d47 #64710, Implicit declaration 2013-04-26 07:48:11 +02:00
Matt Ficken
67a72ceb93 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix Test Bug #64714
 2013-04-25 11:37:36 -07:00
Matt Ficken
7d0dd957eb Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix Test Bug #64714
 2013-04-25 11:37:25 -07:00
Matt Ficken
5adf1be45d Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix Test Bug #64714
 2013-04-25 11:37:09 -07:00
Matt Ficken
bf5506f511 Fix Test Bug #64714 2013-04-25 11:34:57 -07:00
David Soria Parra
e04baf692a Fix curl build on windows 2013-04-25 08:04:30 +02:00
Remi Collet
182fef46a9 Fixed bug #64707 missing declaration after dd0399f 2013-04-25 06:40:55 +02:00
Remi Collet
26bd2cba81 gd: missing headers in previous 2013-04-24 16:15:42 +02:00
Remi Collet
3a8ceed844 allow use of gdImageCreateFromJpegEx with system libgd 2013-04-24 16:15:11 +02:00
Remi Collet
dd0399f5c6 We need both gdImageCreateFromJpeg* and gdImageCreateFromJpeg*Ex 
The new (Ex) functions are used with the new ignore_warning parameter

The standard functions are used in _php_image_create_from_string,
sent as a function pointer, and call without this optional parameter.
 2013-04-24 16:07:50 +02:00
Remi Collet
7189cc5be8 gd: fix proto comment 2013-04-24 14:44:20 +02:00
Anatol Belski
eb4065b9e1 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2013-04-24 14:36:57 +02:00
Remi Collet
aa4b0af20f gd: provide imageflip with system libgd when available 2013-04-24 14:32:03 +02:00
Anatol Belski
8d41f6dab6 Removed fork of ext/zlib/tests/bug_52944.phpt 
The real issue is a bug in asm zlib build, reported here
https://github.com/madler/zlib/issues/41 . Non ASM builds
behave more predictable.
 2013-04-24 14:31:59 +02:00
ptarjan
22f6b6dbec Fix zlib/tests/gzseek to create unique temporary files 
When running tests in parallel these create a race condition.
Race conditions are bad.
 2013-04-24 01:06:55 -07:00
David Soria Parra
4c0746228d Merge branch 'PHP-5.5' 
* PHP-5.5:
  NEWS for RC1
  NEWS for PHP 5.5.0 Beta 4 again
  Fix curl build on windows
 2013-04-25 08:25:10 +02:00
Remi Collet
b0cf340eef Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed bug #64707 missing declaration after dd0399f
 2013-04-25 06:41:01 +02:00
Remi Collet
e12abebf50 Merge branch 'PHP-5.5' 
* PHP-5.5:
  gd: missing headers in previous
  allow use of gdImageCreateFromJpegEx with system libgd
 2013-04-24 16:16:25 +02:00
Remi Collet
5897696a02 Merge branch 'PHP-5.5' 
* PHP-5.5:
  We need both gdImageCreateFromJpeg* and gdImageCreateFromJpeg*Ex
  gd: fix proto comment
 2013-04-24 16:11:34 +02:00
Remi Collet
7264179eef gd: fix proto comment 2013-04-24 14:43:59 +02:00
Anatol Belski
d07b7c2fc0 Merge branch 'master' of git.php.net:php-src 2013-04-24 14:36:41 +02:00
Anatol Belski
fba7c8491b Merge branch 'PHP-5.5' 
* PHP-5.5:
  Removed fork of ext/zlib/tests/bug_52944.phpt
 2013-04-24 14:35:34 +02:00
Remi Collet
1d72ea493d Merge branch 'PHP-5.5' 
* PHP-5.5:
  gd: provide imageflip with system libgd when available
 2013-04-24 14:32:09 +02:00
Stanislav Malyshev
84e5c8a0e2 update credits 2013-04-23 22:02:57 -07:00
Stanislav Malyshev
50800356af Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix bug #64458 (dns_get_record result with string of length -1)
 2013-04-23 21:46:27 -07:00
Stanislav Malyshev
5e24a6e74d Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug #64458 (dns_get_record result with string of length -1)
 2013-04-23 21:45:49 -07:00
Stanislav Malyshev
2a15aed399 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #64458 (dns_get_record result with string of length -1)
 2013-04-23 21:45:10 -07:00
Stanislav Malyshev
f87d2ab893 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug #64458 (dns_get_record result with string of length -1)
 2013-04-23 21:43:55 -07:00
Stanislav Malyshev
18fdab5a09 Fix bug #64458 (dns_get_record result with string of length -1) 2013-04-23 21:43:35 -07:00
Pierrick Charron
74394733ed Merge branch 'PHP-5.5' 
* PHP-5.5:
  Remove curl wrappers
 2013-04-23 17:01:50 -04:00
Pierrick Charron
b79e65f268 Remove curl wrappers 2013-04-23 17:01:17 -04:00
Remi Collet
92a1640694 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix copy/paste in error message
 2013-04-23 13:53:07 +02:00
Remi Collet
2005a15caa fix copy/paste in error message 2013-04-23 13:53:00 +02:00
Remi Collet
2fa178fa41 Merge branch 'PHP-5.5' 
* PHP-5.5:
  enable WebP with system libgd when available
  (re)allow WBMP detection with system libgd provide getbmi and skipheader not exported functions in gd_compat.
 2013-04-23 13:46:24 +02:00
Remi Collet
9819d81ddf enable WebP with system libgd when available 2013-04-23 13:46:10 +02:00
Remi Collet
eb50789910 (re)allow WBMP detection with system libgd 
provide getbmi and skipheader not exported functions in gd_compat.
 2013-04-23 13:43:57 +02:00
Sara Golemon
231e2d762a Merge branch 'PHP-5.5' 
* PHP-5.5:
  array_column() - Use entire subject array when NULL passed for second param.
 2013-04-22 16:20:41 -07:00
Sara Golemon
734e165d4e array_column() - Use entire subject array when NULL passed for second param. 
This starts to look like array_values(), except that you can reindex the arrays
using the third parameter.
 2013-04-22 16:19:21 -07:00
Sara Golemon
35df484b5b Merge branch 'PHP-5.5' 
* PHP-5.5:
  Allow array_column() to take -1 as a valid value in third param
 2013-04-22 15:55:38 -07:00
Sara Golemon
1a03bd5dee Allow array_column() to take -1 as a valid value in third param 
Also do some cleanup and simplification to make this code more
readable in the long term.
 2013-04-22 15:54:21 -07:00