php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-02 21:52:36 +02:00
Code Issues Packages Projects Releases Wiki Activity
75,631 Commits 547 Branches 1,481 Tags
8807726be3494f3dfd0056a32ebac8d64978ebe2
Commit Graph

75631 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Christopher Jones
f95cd93408 Fix unused variable warning in OCI8 2.0 2013-08-13 15:15:57 -07:00
Anatol Belski
c5674bb502 Merge branch 'PHP-5.5' 
* PHP-5.5:
  removed unused vars
 2013-08-12 15:53:34 +02:00
Anatol Belski
bab33f7e05 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  removed unused vars
 2013-08-12 15:52:50 +02:00
Anatol Belski
72aacbf735 removed unused vars 2013-08-12 15:52:15 +02:00
Anatol Belski
42171b13f4 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fixed strndup usage in the pgsql ext
 2013-08-12 15:45:43 +02:00
Anatol Belski
87198989cd Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fixed strndup usage in the pgsql ext
 2013-08-12 15:45:26 +02:00
Anatol Belski
4134ebec8e fixed strndup usage in the pgsql ext 2013-08-12 15:44:47 +02:00
Anatol Belski
acea91b18c Fixes to unified stdint usage 
This recalls 14caf174ff
 2013-08-12 13:39:17 +02:00
Dmitry Stogov
52dac3e8cd Fixed bug #65382 (Segfault in closure_030.phpt) 2013-08-12 10:53:20 +04:00
Yasuo Ohgaki
3ada3aaea6 Revise pgsql test files 2013-08-12 05:14:43 +09:00
Yasuo Ohgaki
727318546d Revise pgsql test for Travis CI 2013-08-11 18:57:39 +09:00
Yasuo Ohgaki
713aedfe65 Add 00version.phpt to get server/protocol/client version. Revise test script description 2013-08-11 18:33:33 +09:00
Stanislav Malyshev
6e92f07926 Merge branch 'PHP-5.5' 
* PHP-5.5:
  use mysqlnd, some tests fail otherwise
 2013-08-11 01:37:44 -07:00
Stanislav Malyshev
76fd13f742 use mysqlnd, some tests fail otherwise 2013-08-11 01:36:59 -07:00