php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-18 21:41:22 +02:00
Code Issues Packages Projects Releases Wiki Activity
74,469 Commits 547 Branches 1,483 Tags
bcf785fb6667194ff70ef6f903189a495c15eb40
Commit Graph

74469 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stanislav Malyshev
bcf785fb66 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #65470	Segmentation fault in zend_error() with --enable-dtrace
 2013-08-18 17:23:59 -07:00
Stanislav Malyshev
14f5732096 Fix bug #65470 Segmentation fault in zend_error() with --enable-dtrace 2013-08-18 17:22:25 -07:00
Stanislav Malyshev
bd29ff7c38 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix for php bug #64802 includes test case

Conflicts:
	ext/openssl/openssl.c
 2013-08-18 15:45:17 -07:00
Mark Jones
9973658a44 Fix for php bug #64802 includes test case 2013-08-18 15:42:37 -07:00
Marcel Araujo
265224778b Use in preg_replace_callback() using variables by reference and test for bug #64979 2013-08-18 15:18:30 -07:00
Marcel Araujo
47678c06c6 https://bugs.php.net/bug.php?id=64979 2013-08-18 15:09:43 -07:00
Stanislav Malyshev
b33a1a1397 add CVE-2011-4718 2013-08-18 14:42:06 -07:00
Stanislav Malyshev
bf0c6f2858 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  new for fix #65225
  Fixed #65225: PHP_BINARY incorrectly set
 2013-08-18 14:21:14 -07:00
Stanislav Malyshev
0154db1c5f new for fix #65225 2013-08-18 14:20:17 -07:00
Patrick Allaert
98d29d20a1 Fixed #65225: PHP_BINARY incorrectly set 2013-08-18 14:18:33 -07:00
Stanislav Malyshev
1794291ebe Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Use pkg-config to detect iodbc
 2013-08-18 14:16:24 -07:00
Ole Markus With
a3fa25e857 Use pkg-config to detect iodbc 2013-08-18 14:16:17 -07:00
Stanislav Malyshev
2ee7e122a7 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Add -P option to use the current binary
  Create test to the extension xmlrpc
 2013-08-18 14:09:19 -07:00
Stanislav Malyshev
3da2fb335d Add -P option to use the current binary 2013-08-18 14:08:03 -07:00
root
ac2d2b9b72 Create test to the extension xmlrpc 2013-08-18 13:59:39 -07:00
Stanislav Malyshev
296a434d52 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixbug: phpize --clean will delete include/*.h
 2013-08-18 13:52:38 -07:00
Tianfeng
4a0e87e497 Fixbug: phpize --clean will delete include/*.h 2013-08-18 13:52:20 -07:00
Veres Lajos
144eab0889 code related typo fixes 2013-08-18 13:46:32 -07:00
Christopher Jones
803045e3c7 Fix duplicated 5.5.2 NEWS in my tree 2013-08-16 12:03:01 -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
466584f40b fix typo 2013-08-16 11:34:16 -07:00
Stanislav Malyshev
4734b31953 merge news for 5.5.2 2013-08-16 11:30:54 -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
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
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
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
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
82dd6b94f2 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
 2013-08-14 21:33:27 -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
cd14de94d2 Reduce compiler noise by removing unused variables and labels 2013-08-14 21:06:59 -07: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
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
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
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
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
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