9877773438
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-04-27 18:00:02 +02:00
25c9f34c9c
fix #64725 , wrong res check
2013-04-27 17:52:30 +02:00
e60638faca
Merge branch 'PHP-5.4' into PHP-5.5
2013-04-27 23:50:23 +08:00
7b9eabaf51
Merge branch 'PHP-5.3' into PHP-5.4
2013-04-27 23:50:02 +08:00
15b554cd9b
Also fixed bug #64726 in 5.3
2013-04-27 23:49:43 +08:00
1c07590ed7
Merge branch 'PHP-5.4' into PHP-5.5
2013-04-27 23:41:51 +08:00
8f5a534b21
Fixed bug #64726 (Segfault when calling fetch_object on a use_result and DB pointer has closed)
2013-04-27 23:41:31 +08:00
d54432ed98
Merge branch 'PHP-5.3' into PHP-5.4
2013-04-27 23:38:10 +08:00
c7b8368ed5
Fix memory realted to #64726
2013-04-27 23:38:00 +08:00
ca148c030f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated libmagic.patch
2013-04-27 14:09:55 +02:00
e9b03c412b
updated libmagic.patch
2013-04-27 14:09:29 +02:00
d72307f1ca
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug bug #64713 Compilation warnings in finfo
2013-04-27 13:51:12 +02:00
cdc1a63790
Fixed bug bug #64713 Compilation warnings in finfo
2013-04-27 13:49:50 +02:00
cf5d7d9e73
Fix implicit declaration warning for cdf_timestamp_to_timespec
2013-04-26 12:28:58 +02:00
b86c85723e
Fix #64711 ("value computed but not used" in parse_date.c)
2013-04-26 11:33:54 +02:00
75cec90d8c
Fix #64712 (Obsolete declarations in php_date.c)
2013-04-26 10:45:08 +02:00
2809afa119
- #64710 , check return val
2013-04-26 08:15:33 +02:00
7bd20354a8
- #64710 , kill unused var
2013-04-26 08:15:05 +02:00
b0afef2d5e
#64710 , kill unused vars
2013-04-26 08:10:24 +02:00
685a6d9aab
#64710 , kill unused vars
2013-04-26 08:09:19 +02:00
7b06189702
#64710 , kill unused vars
2013-04-26 08:08:38 +02:00
3fffc78ed0
#64710 , kill unused vars
2013-04-26 08:07:47 +02:00
b5902b6c9d
#64710 , kill unused vars
2013-04-26 08:06:34 +02:00
afe46d4d47
#64710 , Implicit declaration
2013-04-26 07:48:11 +02:00
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
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
bf5506f511
Fix Test Bug #64714
2013-04-25 11:34:57 -07:00
e04baf692a
Fix curl build on windows
2013-04-25 08:04:30 +02:00
182fef46a9
Fixed bug #64707 missing declaration after dd0399f
2013-04-25 06:40:55 +02:00
26bd2cba81
gd: missing headers in previous
2013-04-24 16:15:42 +02:00
3a8ceed844
allow use of gdImageCreateFromJpegEx with system libgd
2013-04-24 16:15:11 +02:00
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
7189cc5be8
gd: fix proto comment
2013-04-24 14:44:20 +02:00
eb4065b9e1
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-04-24 14:36:57 +02:00
aa4b0af20f
gd: provide imageflip with system libgd when available
2013-04-24 14:32:03 +02:00
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
84e5c8a0e2
update credits
2013-04-23 22:02:57 -07:00
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
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
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
18fdab5a09
Fix bug #64458 (dns_get_record result with string of length -1)
2013-04-23 21:43:35 -07:00
b79e65f268
Remove curl wrappers
2013-04-23 17:01:17 -04:00
2005a15caa
fix copy/paste in error message
2013-04-23 13:53:00 +02:00
9819d81ddf
enable WebP with system libgd when available
2013-04-23 13:46:10 +02:00
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
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
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
f63db963c4
Harden array_column_basic.phpt against resource renumbering.
...
We don't care what resource number it is, so long as there's a
stream resource returned.
2013-04-22 13:36:40 -07:00
8febe2ad08
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed stream_socket_pair() on Windows x64 and
2013-04-22 18:59:11 +02:00
f082d6311b
Fixed stream_socket_pair() on Windows x64 and
...
improved errorhandling in the socketpair() implementation.
2013-04-22 18:55:32 +02:00
Pierre Joye