Ole Markus With
7e7a8f00c4
Use pkg-config to detect iodbc
2013-08-17 14:22:11 +02:00
Christopher Jones
803045e3c7
Fix duplicated 5.5.2 NEWS in my tree
2013-08-16 12:03:01 -07:00
Christopher Jones
0c4ba514be
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
fix typo
merge news for 5.5.2
2013-08-16 11:39:37 -07:00
Christopher Jones
a6f596f90f
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
* 'PHP-5.5' of https://git.php.net/repository/php-src :
fix typo
merge news for 5.5.2
2013-08-16 11:39:07 -07:00
Stanislav Malyshev
a42e87dadb
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix typo
2013-08-16 11:34:27 -07:00
Stanislav Malyshev
466584f40b
fix typo
2013-08-16 11:34:16 -07:00
Stanislav Malyshev
94cd406b1e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
merge news for 5.5.2
2013-08-16 11:31:39 -07:00
Stanislav Malyshev
4734b31953
merge news for 5.5.2
2013-08-16 11:30:54 -07:00
Christopher Jones
c04d1406e9
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Update NEWS
Update NEWS
2013-08-16 11:16:27 -07:00
Christopher Jones
60c8d814e7
Update NEWS
2013-08-16 11:16:06 -07:00
Christopher Jones
7237c317d6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Update NEWS
2013-08-16 11:13:55 -07:00
Christopher Jones
cb539b3e96
Update NEWS
2013-08-16 11:13:27 -07:00
Christopher Jones
8807726be3
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
fix cve number
2013-08-16 11:10:10 -07:00
Christopher Jones
1eadd15607
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
* 'PHP-5.5' of https://git.php.net/repository/php-src :
fix cve number
2013-08-16 11:10:04 -07:00
Christopher Jones
6993ca5bd7
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 :
fix cve number
2013-08-16 11:07:25 -07:00
Christopher Jones
2251e4369a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
With --enable-dtrace, the correct PIC/non-PIC .o files on Solaris and Linux are now used. DTrace is part of Oracle Linux. See https://oss.oracle.com/projects/DTrace/
2013-08-16 10:57:55 -07:00
Christopher Jones
4b4ffaf703
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
With --enable-dtrace, the correct PIC/non-PIC .o files on Solaris and Linux are now used. DTrace is part of Oracle Linux. See https://oss.oracle.com/projects/DTrace/
2013-08-16 10:49:05 -07:00
Christopher Jones
0ebef462ce
With --enable-dtrace, the correct PIC/non-PIC .o files on Solaris and
...
Linux are now used. DTrace is part of Oracle Linux. See
https://oss.oracle.com/projects/DTrace/
This patch does not change DTrace linking for non-Solaris/Linux
platforms.
For SystemTap users on Linux, this patch removes the compilation
warning:
Warning: Linking the shared library libphp5.la against the
non-libtool objects Zend/zend_dtrace.d.o is not portable!
2013-08-16 10:40:50 -07:00
Stanislav Malyshev
991f0113bf
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix cve number
2013-08-16 10:39:15 -07:00
Stanislav Malyshev
5788797964
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix cve number
2013-08-16 10:23:31 -07:00
Stanislav Malyshev
060fadca31
fix cve number
2013-08-16 10:20:32 -07:00
David Soria Parra
30502dbc75
Merge branch 'PHP-5.5'
...
* PHP-5.5:
New news section
Prepare news for PHP-5.5.2
2013-08-15 22:47:28 +02:00
David Soria Parra
e8a4477a48
New news section
2013-08-15 22:41:18 +02:00
David Soria Parra
f12f3abe8e
Prepare news for PHP-5.5.2
2013-08-15 22:40:38 +02:00
Christopher Jones
77dea7898b
Merge branch 'PHP-5.5'
...
* PHP-5.5:
2013-08-14 21:33:35 -07:00
Christopher Jones
82dd6b94f2
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
2013-08-14 21:33:27 -07:00
Christopher Jones
de0a602ce1
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
Fixed #65431 in zend_exception.c by Sixd
2013-08-14 21:32:20 -07:00
Christopher Jones
5a186a3e0a
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
* 'PHP-5.5' of https://git.php.net/repository/php-src :
Fixed #65431 in zend_exception.c by Sixd
2013-08-14 21:32:13 -07:00
Christopher Jones
ba30c78d5c
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 :
Fixed #65431 in zend_exception.c by Sixd
2013-08-14 21:32:07 -07:00
Christopher Jones
ac03b67e6a
Remove unused variable
2013-08-14 21:21:17 -07:00
Christopher Jones
4824d0f43e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Reduce compiler noise by removing unused variables and labels
2013-08-14 21:08:55 -07:00
Christopher Jones
cd14de94d2
Reduce compiler noise by removing unused variables and labels
2013-08-14 21:06:59 -07:00
Xinchen Hui
7d3ec0c3ca
Merge branch 'PHP-5.5'
2013-08-15 11:50:54 +08:00
Xinchen Hui
cb361ed27e
Merge branch 'PHP-5.4' into PHP-5.5
2013-08-15 11:49:59 +08:00
Xinchen Hui
8280393828
Fixed #65431 in zend_exception.c by Sixd
2013-08-15 11:47:44 +08:00
Christopher Jones
3c166c4758
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
Conflicts:
ext/gmp/gmp.c
2013-08-14 20:47:00 -07:00
Christopher Jones
39612afc72
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
Conflicts:
ext/dba/libinifile/inifile.c
2013-08-14 20:43:25 -07:00
Christopher Jones
9ad97cd489
Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
2013-08-14 20:36:50 -07:00
Christopher Jones
759517651e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Skip test if SKIP_ONLINE_TESTS set
2013-08-14 15:47:42 -07:00
Christopher Jones
8c61758dc7
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Skip test if SKIP_ONLINE_TESTS set
2013-08-14 15:45:46 -07:00
Christopher Jones
9d62807190
Skip test if SKIP_ONLINE_TESTS set
2013-08-14 15:45:06 -07:00
Anatol Belski
9d4e5b0dba
Fix to file uploads >2G with size overflow
...
Represent the file size as string when the total size would overflow
LONG_MAX. Otherwise while file itself were uploaded, the size would
be shown wrong. This mostly applies to systems with 32 bit long.
2013-08-14 18:59:46 +02:00
Stanislav Malyshev
4da6273092
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix CVE-2013-4073 - handling of certs with null bytes
Fix CVE-2013-4073 - handling of certs with null bytes
2013-08-13 22:26:32 -07:00
Stanislav Malyshev
2b9f5ac252
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix CVE-2013-4073 - handling of certs with null bytes
Fix CVE-2013-4073 - handling of certs with null bytes
2013-08-13 22:25:47 -07:00
Stanislav Malyshev
7f69f07fc1
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix CVE-2013-4073 - handling of certs with null bytes
2013-08-13 22:24:29 -07:00
Stanislav Malyshev
dcea4ec698
Fix CVE-2013-4073 - handling of certs with null bytes
2013-08-13 22:24:11 -07:00
Stanislav Malyshev
2874696a5a
Fix CVE-2013-4073 - handling of certs with null bytes
2013-08-13 22:20:33 -07:00
Xinchen Hui
b6fa0b40f7
Merge branch 'PHP-5.5'
2013-08-14 11:44:53 +08:00
Xinchen Hui
f3d18add08
Merge branch 'PHP-5.4' into PHP-5.5
2013-08-14 11:44:37 +08:00
Xinchen Hui
f4dc2240a0
Fixed #65431 (Discarded qualifiers from pointer target warnings when using --enable-dtrace) by Sixd
2013-08-14 11:42:39 +08:00