Pierre Joye
|
c480bf3fb2
|
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
add external 2.1 detection and fix gd_compat for 2.1+
|
2013-04-10 20:13:18 +02:00 |
|
Pierre Joye
|
224a67fb9f
|
add external 2.1 detection and fix gd_compat for 2.1+
|
2013-04-10 20:12:25 +02:00 |
|
Pierre Joye
|
aab5659357
|
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
fix possible NULL deref
|
2013-04-09 10:09:36 +02:00 |
|
Pierre Joye
|
88b3cdc4e9
|
fix possible NULL deref
|
2013-04-09 10:09:17 +02:00 |
|
Pierre Joye
|
10d62de4aa
|
Merge branch 'PHP-5.3' into PHP-5.4
# By Pierre Joye (1) and Rasmus Lerdorf (1)
* PHP-5.3:
fix null deref
Fixed bugs #47675 and #64577 (fd leak on Solaris)
|
2013-04-09 10:04:17 +02:00 |
|
Pierre Joye
|
4d4adf47e0
|
fix null deref
|
2013-04-09 10:04:01 +02:00 |
|
Anatol Belski
|
a35d386612
|
updated libmagic.patch
|
2013-04-08 16:23:43 +02:00 |
|
Anatol Belski
|
9de5dcad1c
|
fix ident
|
2013-04-08 15:51:22 +02:00 |
|
Anatol Belski
|
f3ca1155d6
|
Refactored the previous memleak fix
to avoid usage of a freed pointer. Thanks Laruence )
|
2013-04-08 14:32:37 +02:00 |
|
Anatol Belski
|
28e26b0fad
|
fix memory leak at apprentice.c:1095
|
2013-04-08 12:49:53 +02:00 |
|
Anatol Belski
|
b0b81c0a37
|
fixed EOL
|
2013-04-08 09:20:43 +02:00 |
|
Anatol Belski
|
10367fa7c6
|
upgraded libmagic to 5.14
|
2013-04-07 22:15:56 +02:00 |
|
Carson McDonald
|
39bc1bd25f
|
Fix typo
|
2013-04-05 23:27:34 +08:00 |
|
Xinchen Hui
|
185e5e15ae
|
s ,CURL_WRAPPERS_ENABLE,CURL_WRAPPERS_ENABLED,
|
2013-04-04 19:28:17 +08:00 |
|
ptarjan
|
99ad08f9a5
|
Fix #64572: Clean up after the test
Lets not leave stuff lying around.
|
2013-04-03 18:50:27 +08:00 |
|
Xinchen Hui
|
78a9489f6a
|
Use new constant replace ugly trick
|
2013-04-03 10:12:49 +08:00 |
|
Xinchen Hui
|
d7f709a032
|
Add CURL_WRAPPERS_ENABLE constant
see http://news.php.net/php.internals/66871
|
2013-04-03 10:09:51 +08:00 |
|
Xinchen Hui
|
9456dac54e
|
Fix test
|
2013-04-01 18:12:16 +08:00 |
|
Xinchen Hui
|
72426a446d
|
Skip test when --with-curlwrappers enabled.
|
2013-03-31 21:22:48 +08:00 |
|
Sergey Akbarov
|
1d4fcdff9f
|
Fix bug #64433: does not follow redirects for non-3xx response codes
|
2013-03-30 21:22:30 -07:00 |
|
Veres Lajos
|
124a867b6a
|
Typo fix (greater then => greater than)
|
2013-03-28 19:12:08 +08:00 |
|
Anatol Belski
|
04b492a5fe
|
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Reworked the changes for bug #64452
|
2013-03-23 20:59:47 +01:00 |
|
Anatol Belski
|
638c4b89b7
|
Reworked the changes for bug #64452
|
2013-03-23 20:57:59 +01:00 |
|
Xinchen Hui
|
39a173b79b
|
Fix bug in reflectionClass relate to #64239
|
2013-03-21 21:32:06 +08:00 |
|
Xinchen Hui
|
08624ea90d
|
Fix test after f8b91d9acf
|
2013-03-21 15:57:21 +08:00 |
|
Xinchen Hui
|
0fd3572f4e
|
Fixed bug #64432 (more empty delimiter warning in strX methods)
|
2013-03-21 11:14:10 +08:00 |
|
Anatol Belski
|
06a526be3e
|
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed bug #64452 Zip PHPTs crash intermittently
|
2013-03-20 09:12:33 +01:00 |
|
Anatol Belski
|
bb935ff8dc
|
Fixed bug #64452 Zip PHPTs crash intermittently
|
2013-03-20 09:10:10 +01:00 |
|
Anatol Belski
|
cfd096fd7c
|
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Backported fix for bug #62852
|
2013-03-19 21:22:09 +01:00 |
|
Anatol Belski
|
8d199c7c4f
|
Backported fix for bug #62852
|
2013-03-19 21:19:55 +01:00 |
|
Boris Lytochkin
|
85d9d85ce2
|
more test coverage: missing square bracket error message
|
2013-03-17 20:40:15 +04:00 |
|
Boris Lytochkin
|
b32405053f
|
Fix bug #61981
|
2013-03-17 20:00:37 +04:00 |
|
Etienne Kneuss
|
5de1b08482
|
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Remove spurious int cast in between two longs
|
2013-03-16 18:20:06 +01:00 |
|
Etienne Kneuss
|
62364e6e01
|
Remove spurious int cast in between two longs
|
2013-03-16 18:19:14 +01:00 |
|
Anatol Belski
|
90c8f16c3b
|
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Backported patch for #64370
|
2013-03-15 19:08:32 +01:00 |
|
Anatol Belski
|
b903d2d6cd
|
Backported patch for #64370
|
2013-03-15 19:04:40 +01:00 |
|
Anatol Belski
|
5df8cf1975
|
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
fix zts check
|
2013-03-14 14:39:09 +01:00 |
|
Anatol Belski
|
e43c5a8395
|
fix zts check
|
2013-03-14 14:38:20 +01:00 |
|
Andrey Hristov
|
0777a18703
|
Merge branch 'PHP-5.3' into PHP-5.4
Conflicts:
NEWS
|
2013-03-13 14:24:23 +01:00 |
|
Andrey Hristov
|
f1e2edff8b
|
fix for bug #63530 mysqlnd_stmt::bind_one_parameter uses wrong alloc for stmt->param_bind
|
2013-03-13 13:37:51 +01:00 |
|
Anatol Belski
|
a328cc452e
|
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
fixed headers order
|
2013-03-12 08:34:16 +01:00 |
|
Anatol Belski
|
bdaafe3c7b
|
fixed headers order
|
2013-03-12 08:33:36 +01:00 |
|
Derick Rethans
|
98bb5f4798
|
Merge branch 'PHP-5.3' into PHP-5.4
|
2013-03-11 21:36:37 +00:00 |
|
Derick Rethans
|
50ad2af503
|
- Updated to version 2013.2 (2013b)
|
2013-03-11 21:36:36 +00:00 |
|
Xinchen Hui
|
f52b2e6a65
|
Fixed bug #64354 (Unserialize array of objects whose class can't be autoloaded fail)
about the __sleep one, since php_serialize_* are all void function,
so,,only check exception at the very begining
|
2013-03-09 23:00:58 +08:00 |
|
Anatol Belski
|
4e46a87392
|
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed PCRE locale crash in Windows/TS
|
2013-03-04 09:14:14 +01:00 |
|
Stephen A. Zarkos
|
b6fdb60ecf
|
Fixed PCRE locale crash in Windows/TS
|
2013-03-04 09:09:45 +01:00 |
|
Anatol Belski
|
ca4a3e6138
|
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
merged PCRE 8.32
|
2013-03-03 19:07:49 +01:00 |
|
Anatol Belski
|
357ab3cbad
|
merged PCRE 8.32
- defined HAVE_CONFIG_H to simplify the future merges
- PCRE NEWS http://pcre.org/news.txt
|
2013-03-03 19:06:22 +01:00 |
|
Derick Rethans
|
a3f020a4be
|
Merge branch 'PHP-5.3' into PHP-5.4
|
2013-03-03 12:53:23 -05:00 |
|