Christopher Jones
7d59b2264e
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Re-fixed bug #60901 (Improve "tail" syntax for AIX installation)
2012-10-21 22:21:46 -07:00
Christopher Jones
dbb72de6c7
Re-fixed bug #60901 (Improve "tail" syntax for AIX installation)
...
The original fix broke Solaris installs of OCI8
2012-10-21 22:17:47 -07:00
Anatoliy Belsky
cbb857f8b9
update NEWS
2012-10-19 09:58:46 +02:00
Anatoliy Belsky
dfb1956f1a
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
updated NEWS
2012-10-19 09:57:00 +02:00
Anatoliy Belsky
7293cb7250
updated NEWS
2012-10-19 09:56:02 +02:00
Anatoliy Belsky
d2fa182f25
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #63284 PCRE upgrade to 8.31
2012-10-19 09:51:58 +02:00
Anatoliy Belsky
276c5de0d8
Fixed bug #63284 PCRE upgrade to 8.31
2012-10-19 09:49:28 +02:00
Xinchen Hui
bb51549915
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-19 11:24:15 +08:00
Xinchen Hui
90bd54c46e
preg indenpent test script for #63055
2012-10-19 11:22:56 +08:00
Xinchen Hui
dfd4244e73
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-19 11:15:03 +08:00
Xinchen Hui
6444eef27b
Update libmagic.patch
2012-10-19 11:14:14 +08:00
Christopher Jones
05a843c256
Add fix & missing fix
2012-10-18 18:55:15 -07:00
Christopher Jones
c6d6ede4a8
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Add fix & missing fix
2012-10-18 18:51:40 -07:00
Christopher Jones
106c70e76e
Add fix & missing fix
2012-10-18 18:50:18 -07:00
Christopher Jones
85b0eda4c8
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #63307 (Unused variable in oci8.c)
Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro)
2012-10-18 17:57:19 -07:00
Christopher Jones
af14da5714
Fixed bug #63307 (Unused variable in oci8.c)
...
An output section for oci_internal_debug() was setting but not using a variable
2012-10-18 17:53:00 -07:00
Christopher Jones
8bfc002871
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
...
* 'PHP-5.4' of https://git.php.net/repository/php-src : (22 commits)
- Updated to version 2012.7 (2012g)
SUpport newer bisons.
Merge the fix for #61964 to 5.3, which will fix #63304
indent
better fix for #63055
Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
I forgot that inconsistent is only avaliable in debug mode
Add comments
Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
PHP 5.3.18 NEWS
fix NEWS
fix compilation failure on 32/64bit linux systems, when libmysql is used with ext/mysql
Fixed bug #63248 Load multiple magic files on win
Cover have_ssl=NO and have_ssl=DISABLED
- BFN
- Fixed bug #63214 (Large PDO Firebird Queries)
Fix bug #63240 on stream_get_line()
extended the SKIPIF section with ICU 49 (sync with 5.4 branch)
fixed tests for gd having freetype >= 2.4.10
Fixed bug #63258 (seg fault with PDO and dblib using DBSETOPT(H->link, DBQUOTEDIDENT, 1))
...
2012-10-18 17:37:49 -07:00
Christopher Jones
79a048f76f
Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3
...
* 'PHP-5.3' of https://git.php.net/repository/php-src :
- Updated to version 2012.7 (2012g)
SUpport newer bisons.
Merge the fix for #61964 to 5.3, which will fix #63304
indent
better fix for #63055
Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
PHP 5.3.18 NEWS
fix NEWS
fix compilation failure on 32/64bit linux systems, when libmysql is used with ext/mysql
Cover have_ssl=NO and have_ssl=DISABLED
Minor changes for MySQL 5.6
NEWS for 76601c4
Fix bug #63240 on stream_get_line()
extended the SKIPIF section with ICU 49 (sync with 5.4 branch)
fixed tests for gd having freetype >= 2.4.10
2012-10-18 17:37:21 -07:00
Christopher Jones
131dd88505
Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro)
...
Improve high availability for explicitly terminated connections.
2012-10-18 17:33:51 -07:00
Derick Rethans
4980b24025
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-18 21:53:04 +01:00
Derick Rethans
8f7a6c3029
- Updated to version 2012.7 (2012g)
2012-10-18 21:53:03 +01:00
Derick Rethans
b58d45b67f
Merge branch 'PHP-5.3' into PHP-5.4
...
Conflicts:
Zend/acinclude.m4
2012-10-18 17:53:55 +01:00
Derick Rethans
7aed21c557
SUpport newer bisons.
2012-10-18 17:53:21 +01:00
Xinchen Hui
08a06597e6
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-18 23:32:48 +08:00
Xinchen Hui
0d7965f0a3
Merge the fix for #61964 to 5.3, which will fix #63304
2012-10-18 23:29:33 +08:00
Xinchen Hui
f1478bbf9d
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-18 20:13:36 +08:00
Xinchen Hui
db2dc7a6a4
indent
2012-10-18 20:13:14 +08:00
Xinchen Hui
1f8fd609b0
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-18 20:11:32 +08:00
Xinchen Hui
e88cdaa014
better fix for #63055
2012-10-18 20:10:35 +08:00
Xinchen Hui
54cef2bb6d
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-18 17:33:52 +08:00
Xinchen Hui
8bd5e15ff7
Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
2012-10-18 17:31:27 +08:00
Xinchen Hui
4d509708a4
I forgot that inconsistent is only avaliable in debug mode
2012-10-18 16:33:07 +08:00
Xinchen Hui
08b9702f8a
Add comments
2012-10-18 16:06:20 +08:00
Xinchen Hui
ccc519b7a9
Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
...
This should also fixed various segfaults which the bt looks like cored in zval_mark_grey
2012-10-18 15:49:37 +08:00
Johannes Schlüter
82fb5df380
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-17 18:26:27 +02:00
Johannes Schlüter
3899adb46f
PHP 5.3.18 NEWS
2012-10-17 18:25:40 +02:00
Andrey Hristov
505836e999
fix NEWS
2012-10-17 17:56:17 +02:00
Andrey Hristov
7314ed535f
Merge branch 'PHP-5.3' of ssh://git.php.net/php-src into PHP-5.3
2012-10-17 17:23:37 +02:00
Andrey Hristov
c50d732f76
fix compilation failure on 32/64bit linux systems, when libmysql is used
...
with ext/mysql
2012-10-17 17:22:31 +02:00
Christopher Jones
de8b0cfda7
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
...
* 'PHP-5.4' of https://git.php.net/repository/php-src :
Implemented FR #63242 (Default error page in PHP built-in web server uses outdated html/css)
Fix warnings preventing this test from passing
Remove executable permission on inc
2012-10-10 17:28:35 -07:00
Christopher Jones
0da5517cb9
Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3
...
* 'PHP-5.3' of https://git.php.net/repository/php-src :
Remove executable permission on inc
2012-10-10 17:28:31 -07:00
Xinchen Hui
07ea38b443
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2012-10-10 17:24:09 +08:00
Xinchen Hui
ea441bd08d
Implemented FR #63242 (Default error page in PHP built-in web server uses outdated html/css)
2012-10-10 17:23:30 +08:00
Anatoliy Belsky
674ccefc2d
Fix warnings preventing this test from passing
2012-10-10 11:01:07 +02:00
Xinchen Hui
69a4301f6c
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-10 10:45:07 +08:00
Xinchen Hui
1b9e0de2cc
Remove executable permission on inc
2012-10-10 10:44:34 +08:00
Christopher Jones
a19bc9aa9f
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
...
* 'PHP-5.4' of https://git.php.net/repository/php-src :
Remove executable permission on phpt
Remove executable permission on phpt
2012-10-09 19:37:06 -07:00
Christopher Jones
9ea862954b
Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3
...
* 'PHP-5.3' of https://git.php.net/repository/php-src :
Remove executable permission on phpt
2012-10-09 19:37:02 -07:00
Xinchen Hui
45e938ec34
Remove executable permission on phpt
2012-10-10 10:31:53 +08:00
Xinchen Hui
e081c55fb5
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-10 10:31:31 +08:00