mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-01 05:43:38 +08:00
Code Issues Packages Projects Releases Wiki Activity
87,014 Commits 500 Branches 1,381 Tags 821 MiB
e0e2d50046
Commit Graph

460 Commits

Author SHA1 Message Date
Anatol Belski
ef6e9386e3 remove some remains from the old patch 2014-09-25 19:27:36 +02:00
Anatol Belski
fb17d6516d Merge remote-tracking branch 'origin/master' into native-tls 
* origin/master:
  fixed copying of the struct as it's not being modified
  avoid strlen usage in loop
  Removes accidentally added files.
  Reverts some unwanted changes
  Deletes patch leftovers
  Replaces php5 with php7, without whitespace changes.
 2014-09-20 21:37:19 +02:00
krakjoe
b3aebda9ea native tls initial patch 2014-09-20 20:22:14 +01:00
Florian MARGAINE
cf0303e782 Replaces php5 with php7, without whitespace changes. 2014-09-20 10:01:44 +02:00
Lior Kaplan
56d02d564e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  typofixes
 2014-08-17 15:51:15 +03:00
Lior Kaplan
be2128c805 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  typofixes
 2014-08-17 15:48:22 +03:00
Veres Lajos
3f42f2f5d1 typofixes 2014-08-17 15:44:02 +03:00
Remi Collet
cc6c7dd8ff Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  NEWS
  Fix bug #67390 insecure temporary file use in the configure script
 2014-06-06 14:19:05 +02:00
Remi Collet
38e11dfaee Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS
  Fix bug #67390 insecure temporary file use in the configure script
 2014-06-06 14:18:17 +02:00
Remi Collet
91bcadd85e Fix bug #67390 insecure temporary file use in the configure script 2014-06-06 14:16:04 +02: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
Michael Wallner
14caf174ff unify stdint type usage 
if you need C99 stdint types, just include "php_stdint.h"
 2013-08-06 22:49:56 +02:00
Christopher Jones
ca0497bba2 Merge branch 'PHP-5.5' 
* PHP-5.5:
  NEWS for recent DTrace merges. Remove redundant 'cp' during DTrace install.
  Fixed bug #62691 (solaris sed has no -i switch) Make 'make distclean' remove generated DTrace .h file
  Enable dtrace probes on linux as they are compatible with systemtap
  Fixed bug #63706: Cannot build PHP-5.5 with --enable-dtrace on Fedora 17
 2013-08-05 15:46:54 -07:00
Christopher Jones
18f17818a6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS for recent DTrace merges. Remove redundant 'cp' during DTrace install.
 2013-08-05 15:40:56 -07:00
Christopher Jones
47d66a0b4e NEWS for recent DTrace merges. 
Remove redundant 'cp' during DTrace install.
 2013-08-05 15:38:36 -07:00
Christopher Jones
3bbe5931bc Fixed bug #62691 (solaris sed has no -i switch) 
Make 'make distclean' remove generated DTrace .h file
 2013-08-05 15:18:12 -07:00
David Soria Parra
a5c524f1be Enable dtrace probes on linux as they are compatible with systemtap 
You can build php with dtrace probes enabled on linux if you have
systemtap with uprobes.
 2013-08-05 15:07:04 -07:00
Remi Collet
3c5e229212 Fixed bug #63706: Cannot build PHP-5.5 with --enable-dtrace on Fedora 17 2013-08-05 14:52:12 -07:00
Christopher Jones
8fdf1ad32d Merge branch 'PHP-5.5' 
* PHP-5.5:
  Add an empty make command for DTrace .d files to stop an implicit circular dependency in GNU Make which causes .d files to be overwritten (Bug 61268)
  Merge branch 'PHP-5.4'
 2013-08-05 14:28:24 -07:00
Christopher Jones
b90b551228 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Add an empty make command for DTrace .d files to stop an implicit circular dependency in GNU Make which causes .d files to be overwritten (Bug 61268)
  Merge branch 'PHP-5.4'

Conflicts:
	ext/mysqlnd/mysqlnd.c
 2013-08-05 14:27:54 -07:00
Christopher Jones
ec4019e8f6 Add an empty make command for DTrace .d files to stop an implicit 
circular dependency in GNU Make which causes .d files to be
overwritten (Bug 61268)
 2013-08-05 14:21:06 -07:00
Michael Wallner
a8bc184207 fix generating config.nice 
Configure runs like:
$./configure -C CFLAGS="-ggdb" --enable-debug --prefix=$(pwd)/usr
did result in an empty config.nice

* allow single dash flags like -C, -s etc.
* allow passing evnironment variables as arguments
 2013-08-02 13:15:55 +02:00
Christopher Jones
e3a4b87e89 Fixed bug #62691 (solaris sed has no -i switch) 
Make 'make distclean' remove generated DTrace .h file
 2013-07-31 09:58:28 -07:00
Adam Harvey
296a12efbb Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #65088 (Generated configure script is malformed on OpenBSD).
 2013-06-23 11:04:10 -07:00
Adam Harvey
2531307be6 Fix bug #65088 (Generated configure script is malformed on OpenBSD). 
We fell foul of a "common urban legend"[0], which resulted in us backslash
escaping double quotes that we didn't need to in acinclude.m4. This worked fine
on most shells, but OpenBSD's ksh implementation really didn't like it.

[0] http://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.69/html_node/Shell-Substitutions.html
 2013-06-23 11:02:00 -07:00
Stanislav Malyshev
02e4d7a290 Merge branch 'pull-request/341' 
* pull-request/341: (23 commits)
  typofixes
 2013-06-10 14:30:59 -07:00
Stanislav Malyshev
ac40c0b562 Merge branch 'pull-request/341' 
* pull-request/341: (23 commits)
  typofixes
 2013-06-10 14:20:18 -07:00
Remi Collet
201128d39c Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  With pkgconfig < 0.28 output is a single space With pkgconfig = 0.28 output is an empty string, This breaks the test on the 2 vars
 2013-03-28 10:25:39 +01:00
Remi Collet
640e72ce91 With pkgconfig < 0.28 output is a single space 
With pkgconfig = 0.28 output is an empty string,
This breaks the test on the 2 vars

Need to split when
LIB set (ex -lssl -lcrypto)
INC empty (because /usr/include used)
 2013-03-28 10:22:20 +01:00
Remi Collet
717b367085 Fixed bug #63706: Cannot build PHP-5.5 with --enable-dtrace on Fedora 17 2012-12-16 08:51:17 +01:00
David Soria Parra
3de00bc615 Enable dtrace probes on linux as they are compatible with systemtap 
You can build php with dtrace probes enabled on linux if you have
systemtap with uprobes.
 2012-12-04 19:36:06 +01:00
Gustavo Lopes
011af74b23 Fix version in check message 2012-08-26 23:12:41 +02:00
Gustavo Lopes
8831b000ca Require ICU >= 4.0 in configure 2012-08-26 19:28:22 +02:00
Moriyoshi Koizumi
43047598c4 Merge branch 'PHP-5.3' into PHP-5.4 
Conflicts:
	NEWS
 2012-04-03 02:00:23 +09:00
Moriyoshi Koizumi
a6c95c8a00 Reset LIBS temporarily to make sure PHP_CHECK_FUNC will look into libc. 
See Gentoo bug #364139. https://bugs.gentoo.org/show_bug.cgi?id=364139
Reported by Naohiro Aota.
 2012-04-03 01:51:23 +09:00
Hannes Magnusson
6238cf5a7a Looks like we need to explicity add libstdc++ on recent linux' too, like fedora 14 and ubuntu 11 
This fixes build failures for ext/intl and several pecl exts
 2011-12-27 13:53:11 +00:00
Rasmus Lerdorf
809ece9385 Debian/Ubuntu don't have any special CFLAGS listed here for 
gssapi which shouldn't break the build.
 2011-08-21 22:57:13 +00:00
Rasmus Lerdorf
0bea1fea8f Debian/Ubuntu don't have any special CFLAGS listed here for 
gssapi which shouldn't break the build.
 2011-08-21 22:57:13 +00:00
David Soria Parra
ec0b5ffca9 Fix #55269 (--enable-dtrace fail on FreeBSD) 2011-07-26 23:49:37 +00:00
Scott MacVicar
8e314ae7fc Revert part of the fix for #53339 
On OSX we need ssl AND crypto

The patch that was applied didn't even match what was in the bug
 2011-05-19 05:43:48 +00:00
Scott MacVicar
6fad717299 Revert part of the fix for #53339 
On OSX we need ssl AND crypto

The patch that was applied didn't even match what was in the bug
 2011-05-19 05:43:48 +00:00
Rasmus Lerdorf
d257aa42ff Oops, can't cache it here because it won't work 
in autoconf2.13 and we still support that version
in this branch
 2011-05-15 05:49:34 +00:00
Rasmus Lerdorf
8e256774b0 Cache the PDO include path 2011-05-15 05:24:34 +00:00
Rasmus Lerdorf
78a15091f9 Cache the pdo include path 2011-05-15 05:03:29 +00:00
Christopher Jones
0a4d7e88c9 Fixed bug #54084 (Fix apxs Apache version test to work with Oracle HTTP Server) (Chris Jones) 2011-03-23 18:56:47 +00:00
Christopher Jones
8ca08487b7 Fixed bug #54084 (Fix apxs Apache version test to work with Oracle HTTP Server) (Chris Jones) 2011-03-23 18:56:47 +00:00
Raphael Geissert
a286fa3523 Add the libraries we actually test and need for LDAP and OpenSSL, fixes bug #53339 
Patch by Clint Byrum
 2011-03-18 18:47:09 +00:00
Raphael Geissert
5b55a18622 Add the libraries we actually test and need for LDAP and OpenSSL, fixes bug #53339 
Patch by Clint Byrum
 2011-03-18 18:47:09 +00:00